diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-31 12:23:18 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-31 12:23:18 +0200 |
| commit | 8da52a642a293c5b62d044d61e8dd5f5c05eaeb6 (patch) | |
| tree | 0fbbc6b2a4103f52619d0df114015d79b1bb9f49 /pkgs/development | |
| parent | 4c3e6a46754f32c059484b25e35925a92a7c9574 (diff) | |
| parent | acba6b4da25e4b92e2422036104ad2040bef1acd (diff) | |
| download | nixpkgs-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.tar nixpkgs-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.tar.gz nixpkgs-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.tar.bz2 nixpkgs-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.tar.lz nixpkgs-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.tar.xz nixpkgs-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.tar.zst nixpkgs-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.zip | |
Merge branch 'staging' into v/modular
Conflicts (easy): pkgs/development/interpreters/perl/5.10/setup-hook.sh pkgs/development/interpreters/perl/5.8/setup-hook.sh pkgs/development/libraries/gtk+/2.x.nix
Diffstat (limited to 'pkgs/development')
304 files changed, 3048 insertions, 2370 deletions
diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix index 3e74c143c61..484de02f05d 100644 --- a/pkgs/development/arduino/ino/default.nix +++ b/pkgs/development/arduino/ino/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { # TODO: add avrgcclibc, it must be rebuild with C++ support propagatedBuildInputs = [ arduino_core avrdude minicom pythonPackages.configobj - pythonPackages.jinja2 pythonPackages.pyserial ]; + pythonPackages.jinja2 pythonPackages.pyserial pythonPackages.six ]; patchPhase = '' echo "Patching Arduino distribution path" diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index 8c71138ab78..c66143fe1f3 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.0"; + version = "0.1.1"; src = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz"; - sha256 = "0i7b9v7xki9j2jjjpydz0gl33af94b4jjmk75b9w20bs003v8vd4"; + sha256 = "17yr5zc4cr4zlizhzy43ihfcidl63wjxcc002amzahskib4fsbmb"; }; buildInputs = [ gmp ]; diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix index 16dfa580a19..8564175d363 100644 --- a/pkgs/development/compilers/bigloo/default.nix +++ b/pkgs/development/compilers/bigloo/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { checkTarget = "test"; meta = { - description = "Bigloo, an efficient Scheme compiler"; + description = "Efficient Scheme compiler"; longDescription = '' Bigloo is a Scheme implementation devoted to one goal: enabling diff --git a/pkgs/development/compilers/cryptol/1.8.x.nix b/pkgs/development/compilers/cryptol/1.8.x.nix index 4cf00ad3806..17382ed9d56 100644 --- a/pkgs/development/compilers/cryptol/1.8.x.nix +++ b/pkgs/development/compilers/cryptol/1.8.x.nix @@ -1,5 +1,7 @@ { stdenv, requireFile, gmp4, ncurses, zlib, clang_33, makeWrapper }: +assert stdenv.isLinux; + let name = "cryptol-${version}-${rev}"; version = "1.8.27"; diff --git a/pkgs/development/compilers/cudatoolkit/5.5.nix b/pkgs/development/compilers/cudatoolkit/5.5.nix index 99f0828012f..bf4009f08be 100644 --- a/pkgs/development/compilers/cudatoolkit/5.5.nix +++ b/pkgs/development/compilers/cudatoolkit/5.5.nix @@ -51,8 +51,11 @@ stdenv.mkDerivation rec { perl ./install-linux.pl --prefix="$out" rm $out/tools/CUDA_Occupancy_Calculator.xls perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out" + mv $out/include $out/usr_include ''; + setupHook = ./setup-hook.sh; + meta = { license = [ "nonfree" ]; }; diff --git a/pkgs/development/compilers/cudatoolkit/6.0.nix b/pkgs/development/compilers/cudatoolkit/6.0.nix index 573cc826221..5da4b3d0a4a 100644 --- a/pkgs/development/compilers/cudatoolkit/6.0.nix +++ b/pkgs/development/compilers/cudatoolkit/6.0.nix @@ -51,8 +51,11 @@ stdenv.mkDerivation rec { perl ./install-linux.pl --prefix="$out" rm $out/tools/CUDA_Occupancy_Calculator.xls perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out" + mv $out/include $out/usr_include ''; + setupHook = ./setup-hook.sh; + meta = { license = [ "nonfree" ]; }; diff --git a/pkgs/development/compilers/cudatoolkit/setup-hook.sh b/pkgs/development/compilers/cudatoolkit/setup-hook.sh new file mode 100644 index 00000000000..1b75a2e91ba --- /dev/null +++ b/pkgs/development/compilers/cudatoolkit/setup-hook.sh @@ -0,0 +1,8 @@ +addIncludePath () { + if test -d "$1/usr_include" + then + export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE} -I$1/usr_include" + fi +} + +envHooks=(${envHooks[@]} addIncludePath) diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix new file mode 100644 index 00000000000..3eb9aef528c --- /dev/null +++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchgit, python }: + +let + tag = "1.21.0"; +in + +stdenv.mkDerivation rec { + name = "emscripten-fastcomp-${tag}"; + + srcFC = fetchgit { + url = git://github.com/kripken/emscripten-fastcomp; + rev = "refs/tags/${tag}"; + sha256 = "0mcxzg2cfg0s1vfm3bh1ar4xsddb6xkv1dsdbgnpx38lbj1mvfs1"; + }; + + srcFL = fetchgit { + url = git://github.com/kripken/emscripten-fastcomp-clang; + rev = "refs/tags/${tag}"; + sha256 = "0s2jcn36d236cfpryjpgaazjp3cg83d0h78g6kk1j6vdppv3vgnp"; + }; + + buildInputs = [ python ]; + buildCommand = '' + cp -as ${srcFC} $TMPDIR/src + chmod +w $TMPDIR/src/tools + cp -as ${srcFL} $TMPDIR/src/tools/clang + + chmod +w $TMPDIR/src + mkdir $TMPDIR/src/build + cd $TMPDIR/src/build + + ../configure --enable-optimized --disable-assertions --enable-targets=host,js + make + cp -a Release/bin $out + ''; + meta = with stdenv.lib; { + homepage = https://github.com/kripken/emscripten-fastcomp; + description = "emscripten llvm"; + maintainers = with maintainers; [ bosu ]; + license = "University of Illinois/NCSA Open Source License"; + }; +} diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix new file mode 100644 index 00000000000..43f256b58b0 --- /dev/null +++ b/pkgs/development/compilers/emscripten/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchgit, emscriptenfastcomp, python, nodejs, closurecompiler, jre }: + +let + tag = "1.21.0"; +in + +stdenv.mkDerivation rec { + name = "emscripten-${tag}"; + + src = fetchgit { + url = git://github.com/kripken/emscripten; + rev = "refs/tags/${tag}"; + sha256 = "0y17ab4nhd3521b50sv2i2667w0rlcnmlkpkgw5j3fsh8awxgf32"; + }; + + buildCommand = '' + mkdir $out + cp -a $src $out/bin + chmod -R +w $out/bin + grep -rl '^#!/usr.*python' $out/bin | xargs sed -i -s 's@^#!/usr.*python.*@#!${python}/bin/python@' + sed -i -e "s,EM_CONFIG = '~/.emscripten',EM_CONFIG = '$out/config'," $out/bin/tools/shared.py + sed -i -e 's,^.*did not see a source tree above the LLVM.*$, return True,' $out/bin/tools/shared.py + sed -i -e 's,def check_sanity(force=False):,def check_sanity(force=False):\n return,' $out/bin/tools/shared.py + + echo "EMSCRIPTEN_ROOT = '$out/bin'" > $out/config + echo "LLVM_ROOT = '${emscriptenfastcomp}'" >> $out/config + echo "PYTHON = '${python}/bin/python'" >> $out/config + echo "NODE_JS = '${nodejs}/bin/node'" >> $out/config + echo "JS_ENGINES = [NODE_JS]" >> $out/config + echo "COMPILER_ENGINE = NODE_JS" >> $out/config + echo "CLOSURE_COMPILER = '${closurecompiler}/bin/closure-compiler'" >> $out/config + echo "JAVA = '${jre}/bin/java'" >> $out/config + ''; + meta = with stdenv.lib; { + homepage = https://github.com/kripken/emscripten; + description = "An LLVM-to-JavaScript Compiler"; + maintainers = with maintainers; [ bosu ]; + license = with licenses; ncsa; + }; +} diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 265b08c1fbd..3d9f2596c96 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -18,7 +18,7 @@ rec { phaseNames = ["doConfigure" "doMakeInstall"]; meta = { - description = "Gambit Scheme to C compiler"; + description = "Scheme to C compiler"; maintainers = [ a.lib.maintainers.raskin ]; diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix index fafa045e562..1dcdd89b5bf 100644 --- a/pkgs/development/compilers/go/1.3.nix +++ b/pkgs/development/compilers/go/1.3.nix @@ -1,5 +1,7 @@ { stdenv, lib, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc }: +assert stdenv.gcc.gcc != null; + let loader386 = "${glibc}/lib/ld-linux.so.2"; loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2"; @@ -7,11 +9,11 @@ let in stdenv.mkDerivation { - name = "go-1.3"; + name = "go-1.3.1"; src = fetchurl { - url = https://storage.googleapis.com/golang/go1.3.src.tar.gz; - sha256 = "10jkqgzlinzynciw3wr15c7n2vw5q4d2ni65hbs3i61bbdn3x67b"; + url = https://storage.googleapis.com/golang/go1.3.1.src.tar.gz; + sha256 = "fdfa148cc12f1e4ea45a5565261bf43d8a2e7d1fad4a16aed592d606223b93a8"; }; buildInputs = [ bison bash makeWrapper ] ++ lib.optionals stdenv.isLinux [ glibc ] ; diff --git a/pkgs/development/compilers/hugs/default.nix b/pkgs/development/compilers/hugs/default.nix index c3f14826c8a..14751799795 100644 --- a/pkgs/development/compilers/hugs/default.nix +++ b/pkgs/development/compilers/hugs/default.nix @@ -47,7 +47,7 @@ composableDerivation.composableDerivation {} { meta = { license = "as-is"; # gentoo is calling it this way.. - description = "The HUGS 98 Haskell interpreter"; + description = "Haskell interpreter"; homepage = http://www.haskell.org/hugs; }; } diff --git a/pkgs/development/compilers/ikarus/default.nix b/pkgs/development/compilers/ikarus/default.nix index 070f29e16f6..e9bf6c8bb5b 100644 --- a/pkgs/development/compilers/ikarus/default.nix +++ b/pkgs/development/compilers/ikarus/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ]; meta = { - description = "Ikarus - a Scheme compiler, aiming at R6RS"; + description = "Scheme compiler, aiming at R6RS"; homepage = http://ikarus-scheme.org/; license = stdenv.lib.licenses.gpl3; }; diff --git a/pkgs/development/compilers/julia/0.3.0.nix b/pkgs/development/compilers/julia/0.3.0.nix new file mode 100644 index 00000000000..3259fee55bf --- /dev/null +++ b/pkgs/development/compilers/julia/0.3.0.nix @@ -0,0 +1,157 @@ +{ 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, which + } : + +assert stdenv.isLinux; + +let + realGcc = stdenv.gcc.gcc; +in +stdenv.mkDerivation rec { + pname = "julia"; + version = "0.3.0"; + name = "${pname}-${version}"; + + dsfmt_ver = "2.2"; + grisu_ver = "1.1.1"; + openblas_ver = "v0.2.10"; + lapack_ver = "3.5.0"; + arpack_ver = "3.1.5"; + lighttpd_ver = "1.4.29"; + patchelf_ver = "0.6"; + pcre_ver = "8.31"; + 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"; + }; + grisu_src = fetchurl { + url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz"; + sha256 = "e1cabb73fd69e74f145aea91100cde483aef8b79dc730fcda0a34466730d4d1d"; + }; + openblas_src = fetchurl { + url = "https://github.com/xianyi/OpenBLAS/tarball/${openblas_ver}"; + name = "openblas-${openblas_ver}.tar.gz"; + sha256 = "06i0q4qnd5q5xljzrgvda0gjsczc6l2pl9hw6dn2qjpw38al73za"; + }; + arpack_src = fetchurl rec { + url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/get/arpack-ng_${arpack_ver}.tar.gz"; + sha256 = "05fmg4m0yri47rzgsl2mnr1qbzrs7qyd557p3v9wwxxw0rwcwsd2"; + }; + 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"; + }; + 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"; + }; + utf8proc_src = fetchurl { + url = "http://www.public-software-group.org/pub/projects/utf8proc/v${utf8proc_ver}/utf8proc-v${utf8proc_ver}.tar.gz"; + sha256 = "1rwr84pw92ajjlbcxq0da7yxgg3ijngmrj7vhh2qzsr2h2kqzp7y"; + }; + + src = fetchgit { + url = "git://github.com/JuliaLang/julia.git"; + rev = "refs/tags/v0.3.0"; + sha256 = "1h7icqjiccw26f81r1zwsv31kk6yhavn038h7jp63iv5sdzh5r8i"; + }; + + 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 which + ]; + + configurePhase = '' + for i in GMP LLVM PCRE 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}" "${patchelf_src}" \ + "${pcre_src}" "${utf8proc_src}" "${lapack_src}" "${openblas_src}"; do + copy_kill_hash "$i" deps + done + + ${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 -lblas -lopenblas -L$out/lib"''} + 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} prefix=$out" + + export dontPatchELF=1 + + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/usr/lib:$PWD/usr/lib/julia" + + patchShebangs . contrib + + export PATH="$PATH:${stdenv.gcc.libc}/sbin" + + # ldconfig doesn't seem to ever work on NixOS; system-wide ldconfig cache + # is probably not what we want anyway on non-NixOS + sed -e "s@/sbin/ldconfig@true@" -i src/ccall.* + + ln -s "${openblas}/lib/libopenblas.so" "$out/lib/libblas.so" + ''; + + 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 + ''; + + dontStrip = true; + + 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/"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = with stdenv.lib.platforms; linux; + broken = false; + }; +} diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix index 21af582c594..de9b44a4414 100644 --- a/pkgs/development/compilers/mercury/default.nix +++ b/pkgs/development/compilers/mercury/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Mercury is a pure logic programming language."; + description = "A pure logic programming language"; longDescription = '' Mercury is a logic/functional programming language which combines the clarity and expressiveness of declarative programming with advanced diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index c025fc8073b..b10aaedb483 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, makeWrapper, gnum4, texinfo, texLive, automake }: let - version = "9.1.1"; + version = "9.2"; bootstrapFromC = ! (stdenv.isi686 || stdenv.isx86_64); arch = if stdenv.isi686 then "-i386" @@ -19,14 +19,14 @@ stdenv.mkDerivation { if stdenv.isi686 then fetchurl { url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-i386.tar.gz"; - sha256 = "0vi760fy550d9db538m0vzbq1mpdncvw9g8bk4lswk0kcdira55z"; + sha256 = "1fmlpnhf5a75db93phajh4ysbdgrgl72v45lk3kznriprl0a7jc6"; } else if stdenv.isx86_64 then fetchurl { url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-x86-64.tar.gz"; - sha256 = "1wcxm9hyfc53myvlcn93fyqrnnn4scwkknl9hkbp1cphc6mp291x"; + sha256 = "1skzxxhr0iq96bf0j5m7mvf3i4sppfyfa6gpqn34mwgkw1fx8274"; } else fetchurl { url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-c-${version}.tar.gz"; - sha256 = "0pclakzwxbqgy6wqwvs6ml62wgby8ba8xzmwzdwhx1v8wv05yw1j"; + sha256 = "0w5ib5vsidihb4hb6fma3sp596ykr8izagm57axvgd6lqzwicsjg"; }; configurePhase = @@ -65,7 +65,7 @@ stdenv.mkDerivation { # XXX: The `check' target doesn't exist. doCheck = false; - meta = { + meta = with stdenv.lib; { description = "MIT/GNU Scheme, a native code Scheme compiler"; longDescription = @@ -78,14 +78,12 @@ stdenv.mkDerivation { homepage = http://www.gnu.org/software/mit-scheme/; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = with maintainers; [ ludo ]; # Build fails on Cygwin and Darwin: # <http://article.gmane.org/gmane.lisp.scheme.mit-scheme.devel/489>. - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.freebsd; - - broken = true; + platforms = platforms.gnu ++ platforms.freebsd; }; } diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix index 281aa1a9de6..1d68585d93a 100644 --- a/pkgs/development/compilers/ocaml/3.10.0.nix +++ b/pkgs/development/compilers/ocaml/3.10.0.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (rec { meta = { homepage = http://caml.inria.fr/ocaml; license = "QPL, LGPL2 (library part)"; - desctiption = "Most popular variant of the Caml language"; + description = "Most popular variant of the Caml language"; }; }) diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix index 64cf8a9f9f7..195e83e7313 100644 --- a/pkgs/development/compilers/ocaml/3.11.2.nix +++ b/pkgs/development/compilers/ocaml/3.11.2.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; - description = "Objective Caml, the most popular variant of the Caml language"; + description = "Most popular variant of the Caml language"; longDescription = '' Objective Caml is the 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 f916f5a7923..16c3cb1d787 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; - description = "OCaml, the most popular variant of the Caml language"; + description = "Most popular variant of the Caml language"; longDescription = '' diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index 8662db70c26..5b1e69b86b0 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; - description = "OCaml, the most popular variant of the Caml language"; + description = "Most popular variant of the Caml language"; longDescription = '' diff --git a/pkgs/development/compilers/ocaml/4.01.0.nix b/pkgs/development/compilers/ocaml/4.01.0.nix index 0f68014fad6..2876bce9caf 100644 --- a/pkgs/development/compilers/ocaml/4.01.0.nix +++ b/pkgs/development/compilers/ocaml/4.01.0.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; - description = "OCaml, the most popular variant of the Caml language"; + description = "Most popular variant of the Caml language"; longDescription = '' diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix index 9c5fa3764ba..8b86c805c61 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://okmij.org/ftp/ML/index.html#ber-metaocaml"; license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; - description = "a conservative extension of OCaml with the primitive type of code values, and three basic multi-stage expression forms: Brackets, Escape, and Run"; + description = "A conservative extension of OCaml with the primitive type of code values, and three basic multi-stage expression forms: Brackets, Escape, and Run"; }; } diff --git a/pkgs/development/compilers/qi/default.nix b/pkgs/development/compilers/qi/default.nix index ecb022d942a..5665fc5da6c 100644 --- a/pkgs/development/compilers/qi/default.nix +++ b/pkgs/development/compilers/qi/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { builder = writeScript (name + "-builder") (textClosure localDefs [allBuild doForceShare doPropagate]); meta = { - description = "Qi - next generation on top of Common Lisp"; + description = "Functional programming language, built top of Common Lisp"; }; } diff --git a/pkgs/development/compilers/rdmd/default.nix b/pkgs/development/compilers/rdmd/default.nix index 9177ad5e25b..621ace195bb 100644 --- a/pkgs/development/compilers/rdmd/default.nix +++ b/pkgs/development/compilers/rdmd/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = { - description = "rdmd wrapper for D language compiler"; + description = "Wrapper for D language compiler"; homepage = http://dlang.org/rdmd.html; license = lib.licenses.boost; maintainers = with stdenv.lib.maintainers; [ vlstill ]; diff --git a/pkgs/development/compilers/rustc/0.11.nix b/pkgs/development/compilers/rustc/0.11.nix index 1c3b09b0985..a7246e44a73 100644 --- a/pkgs/development/compilers/rustc/0.11.nix +++ b/pkgs/development/compilers/rustc/0.11.nix @@ -1,5 +1,7 @@ {stdenv, fetchurl, which, file, perl, curl, python27, makeWrapper}: +assert stdenv.gcc.gcc != null; + /* Rust's build process has a few quirks : - It requires some patched in llvm that haven't landed upstream, so it diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index ad33906ae6e..4f512096a42 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -1,5 +1,7 @@ {stdenv, fetchurl, fetchgit, which, file, perl, curl, python27, makeWrapper}: +assert stdenv.gcc.gcc != null; + /* Rust's build process has a few quirks : - It requires some patched in llvm that haven't landed upstream, so it diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index bd81e4c055d..e299be9144e 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Scala is a general purpose programming language"; + description = "General purpose programming language"; longDescription = '' Scala is a general purpose programming language designed to express common programming patterns in a concise, elegant, and type-safe way. diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 1e82e03f16c..bd71ab7b27f 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { checkTarget = "test"; meta = { - description = "TinyCC, a small, fast, and embeddable C compiler and interpreter"; + description = "Small, fast, and embeddable C compiler and interpreter"; longDescription = '' TinyCC (aka TCC) is a small but hyper fast C compiler. Unlike diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 6e4051ff46e..2ddad5cde67 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -65,7 +65,7 @@ meta = { - description = "GNU Guile 2.0, an embeddable Scheme implementation"; + description = "Embeddable Scheme implementation"; homepage = http://www.gnu.org/software/guile/; license = stdenv.lib.licenses.lgpl3Plus; maintainers = with stdenv.lib.maintainers; [ ludo lovek323 ]; diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index e112a5ae43d..e14132a8acf 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://maude.cs.uiuc.edu/"; - description = "Maude -- a high-level specification language"; + description = "High-level specification language"; license = stdenv.lib.licenses.gpl2; longDescription = '' diff --git a/pkgs/development/interpreters/perl/5.10/default.nix b/pkgs/development/interpreters/perl/5.10/default.nix deleted file mode 100644 index 6af35e275c8..00000000000 --- a/pkgs/development/interpreters/perl/5.10/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ stdenv, fetchurl }: - -let - - libc = if stdenv ? gcc && stdenv.gcc.libc != null then stdenv.gcc.libc else "/usr"; - -in - -stdenv.mkDerivation rec { - name = "perl-5.10.1"; - - src = fetchurl { - url = "mirror://cpan/src/${name}.tar.gz"; - sha256 = "0dagnhjgmslfx1jawz986nvc3jh1klk7mn2l8djdca1b9gm2czyb"; - }; - - patches = - [ # Do not look in /usr etc. for dependencies. - ./no-sys-dirs.patch - ]; - - # Build a thread-safe Perl with a dynamic libperls.o. We need the - # "installstyle" option to ensure that modules are put under - # $out/lib/perl5 - this is the general default, but because $out - # contains the string "perl", Configure would select $out/lib. - # Miniperl needs -lm. perl needs -lrt. - configureFlags = - [ "-de" - "-Dcc=gcc" - "-Uinstallusrbinperl" - "-Dinstallstyle=lib/perl5" - "-Duseshrplib" - "-Dlocincpth=${libc}/include" - "-Dloclibpth=${libc}/lib" - ] - ++ stdenv.lib.optional (stdenv ? glibc) "-Dusethreads"; - - configureScript = "${stdenv.shell} ./Configure"; - - dontAddPrefix = true; - - enableParallelBuilding = true; - - preConfigure = - '' - configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" - - ${stdenv.lib.optionalString stdenv.isArm '' - configureFlagsArray=(-Dldflags="-lm -lrt") - ''} - ''; - - preBuild = stdenv.lib.optionalString (!(stdenv ? gcc && stdenv.gcc.nativeTools)) - '' - # Make Cwd work on NixOS (where we don't have a /bin/pwd). - substituteInPlace lib/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'" - ''; - - setupHook = ./setup-hook.sh; - - passthru.libPrefix = "lib/perl5/site_perl"; -} diff --git a/pkgs/development/interpreters/perl/5.10/no-sys-dirs.patch b/pkgs/development/interpreters/perl/5.10/no-sys-dirs.patch deleted file mode 100644 index 29edf68bb64..00000000000 --- a/pkgs/development/interpreters/perl/5.10/no-sys-dirs.patch +++ /dev/null @@ -1,201 +0,0 @@ -diff -rc -x '*~' perl-5.10.1-orig/Configure perl-5.10.1/Configure -*** perl-5.10.1-orig/Configure 2009-08-18 21:03:53.000000000 +0200 ---- perl-5.10.1/Configure 2010-01-26 19:08:32.933792254 +0100 -*************** -*** 103,117 **** - fi - - : Proper PATH setting -! paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin' -! paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin" -! paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin" -! paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" -! paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" -! paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin" -! paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib" -! paths="$paths /sbin /usr/sbin /usr/libexec" -! paths="$paths /system/gnu_library/bin" - - for p in $paths - do ---- 103,109 ---- - fi - - : Proper PATH setting -! paths='' - - for p in $paths - do -*************** -*** 1301,1317 **** - archname='' - libnames='' - : change the next line if compiling for Xenix/286 on Xenix/386 -! xlibpth='/usr/lib/386 /lib/386' - : Possible local library directories to search. -! loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" -! loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" - - : general looking path for locating libraries -! glibpth="/lib /usr/lib $xlibpth" -! glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" -! test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" -! test -f /shlib/libc.so && glibpth="/shlib $glibpth" -! test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64" - - : Private path used by Configure to find libraries. Its value - : is prepended to libpth. This variable takes care of special ---- 1293,1304 ---- - archname='' - libnames='' - : change the next line if compiling for Xenix/286 on Xenix/386 -! xlibpth='' - : Possible local library directories to search. -! loclibpth="" - - : general looking path for locating libraries -! glibpth="" - - : Private path used by Configure to find libraries. Its value - : is prepended to libpth. This variable takes care of special -*************** -*** 1329,1336 **** - - : Possible local include directories to search. - : Set locincpth to "" in a hint file to defeat local include searches. -! locincpth="/usr/local/include /opt/local/include /usr/gnu/include" -! locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include" - : - : no include file wanted by default - inclwanted='' ---- 1316,1322 ---- - - : Possible local include directories to search. - : Set locincpth to "" in a hint file to defeat local include searches. -! locincpth="" - : - : no include file wanted by default - inclwanted='' -*************** -*** 1358,1365 **** - libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" - : We probably want to search /usr/shlib before most other libraries. - : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. -- glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` -- glibpth="/usr/shlib $glibpth" - : Do not use vfork unless overridden by a hint file. - usevfork=false - ---- 1344,1349 ---- -*************** -*** 2366,2372 **** - zip - " - pth=`echo $PATH | sed -e "s/$p_/ /g"` -- pth="$pth /lib /usr/lib" - for file in $loclist; do - eval xxx=\$$file - case "$xxx" in ---- 2350,2355 ---- -*************** -*** 8361,8373 **** - echo " " - case "$sysman" in - '') -! syspath='/usr/share/man/man1 /usr/man/man1' -! syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1" -! syspath="$syspath /usr/man/u_man/man1" -! syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1" -! syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1" -! syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1" -! sysman=`./loc . /usr/man/man1 $syspath` - ;; - esac - if $test -d "$sysman"; then ---- 8344,8351 ---- - echo " " - case "$sysman" in - '') -! syspath='' -! sysman='' - ;; - esac - if $test -d "$sysman"; then -*************** -*** 19476,19484 **** - case "$full_ar" in - '') full_ar=$ar ;; - esac - - : Store the full pathname to the sed program for use in the C program -! full_sed=$sed - - : see what type gids are declared as in the kernel - echo " " ---- 19454,19463 ---- - case "$full_ar" in - '') full_ar=$ar ;; - esac -+ full_ar=ar - - : Store the full pathname to the sed program for use in the C program -! full_sed=sed - - : see what type gids are declared as in the kernel - echo " " -diff -rc -x '*~' perl-5.10.1-orig/ext/Errno/Errno_pm.PL perl-5.10.1/ext/Errno/Errno_pm.PL -*** perl-5.10.1-orig/ext/Errno/Errno_pm.PL 2009-06-27 18:09:45.000000000 +0200 ---- perl-5.10.1/ext/Errno/Errno_pm.PL 2010-01-26 18:08:09.552792021 +0100 -*************** -*** 144,154 **** - if ($dep =~ /(\S+errno\.h)/) { - $file{$1} = 1; - } -! } elsif ($^O eq 'linux' && -! $Config{gccversion} ne '' && -! $Config{gccversion} !~ /intel/i -! # might be using, say, Intel's icc -! ) { - # Some Linuxes have weird errno.hs which generate - # no #file or #line directives - my $linux_errno_h = -e '/usr/include/errno.h' ? ---- 144,150 ---- - if ($dep =~ /(\S+errno\.h)/) { - $file{$1} = 1; - } -! } elsif (0) { - # Some Linuxes have weird errno.hs which generate - # no #file or #line directives - my $linux_errno_h = -e '/usr/include/errno.h' ? -diff -rc -x '*~' perl-5.10.1-orig/hints/freebsd.sh perl-5.10.1/hints/freebsd.sh -*** perl-5.10.1-orig/hints/freebsd.sh 2009-02-12 23:58:12.000000000 +0100 ---- perl-5.10.1/hints/freebsd.sh 2010-01-26 18:30:01.181854620 +0100 -*************** -*** 118,130 **** - objformat=`/usr/bin/objformat` - if [ x$objformat = xaout ]; then - if [ -e /usr/lib/aout ]; then -! libpth="/usr/lib/aout /usr/local/lib /usr/lib" -! glibpth="/usr/lib/aout /usr/local/lib /usr/lib" - fi - lddlflags='-Bshareable' - else -! libpth="/usr/lib /usr/local/lib" -! glibpth="/usr/lib /usr/local/lib" - ldflags="-Wl,-E " - lddlflags="-shared " - fi ---- 118,130 ---- - objformat=`/usr/bin/objformat` - if [ x$objformat = xaout ]; then - if [ -e /usr/lib/aout ]; then -! libpth="" -! glibpth="" - fi - lddlflags='-Bshareable' - else -! libpth="" -! glibpth="" - ldflags="-Wl,-E " - lddlflags="-shared " - fi diff --git a/pkgs/development/interpreters/perl/5.10/setup-hook.sh b/pkgs/development/interpreters/perl/5.10/setup-hook.sh deleted file mode 100644 index a8656b8531d..00000000000 --- a/pkgs/development/interpreters/perl/5.10/setup-hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -addPerlLibPath () { - addToSearchPath PERL5LIB $1/lib/perl5/site_perl -} - -envHooks+=(addPerlLibPath) diff --git a/pkgs/development/interpreters/perl/5.8/default.nix b/pkgs/development/interpreters/perl/5.8/default.nix deleted file mode 100644 index b23b95f72b5..00000000000 --- a/pkgs/development/interpreters/perl/5.8/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ stdenv, fetchurl -, impureLibcPath ? null -}: - -stdenv.mkDerivation { - name = "perl-5.8.8"; - - phases = "phase"; - phase = - '' -source $stdenv/setup - -if test "$NIX_ENFORCE_PURITY" = "1"; then - GLIBC=${if impureLibcPath == null then "$(cat $NIX_GCC/nix-support/orig-libc)" else impureLibcPath} - extraflags="-Dlocincpth=$GLIBC/include -Dloclibpth=$GLIBC/lib" -fi - -configureScript=./Configure -configureFlags="-de -Dcc=gcc -Dprefix=$out -Uinstallusrbinperl $extraflags" -dontAddPrefix=1 - -preBuild() { - # Make Cwd work on NixOS (where we don't have a /bin/pwd). - substituteInPlace lib/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'" -} - -postInstall() { - mkdir -p "$out/nix-support" - cp $setupHook $out/nix-support/setup-hook -} - -unset phases -genericBuild - - ''; - - src = fetchurl { - url = mirror://cpan/src/perl-5.8.8.tar.bz2; - sha256 = "1j8vzc6lva49mwdxkzhvm78dkxyprqs4n4057amqvsh4kh6i92l1"; - }; - - patches = [ - # This patch does the following: - # 1) Do use the PATH environment variable to find the `pwd' command. - # By default, Perl will only look for it in /lib and /usr/lib. - # !!! what are the security implications of this? - # 2) Force the use of <errno.h>, not /usr/include/errno.h, on Linux - # systems. (This actually appears to be due to a bug in Perl.) - ./no-sys-dirs.patch - - # Patch to make Perl 5.8.8 build with GCC 4.2. Taken from - # http://www.nntp.perl.org/group/perl.perl5.porters/2006/11/msg117738.html - ./gcc-4.2.patch - - # Fix for "SysV.xs:7:25: error: asm/page.h: No such file or - # directory" on recent kernel headers. From - # http://bugs.gentoo.org/show_bug.cgi?id=168312. - (fetchurl { - url = http://bugs.gentoo.org/attachment.cgi?id=111427; - sha256 = "017pj0nbqb7kwj3cs727c2l2d8c45l9cwxf71slgb807kn3ppgmn"; - }) - ]; - - setupHook = ./setup-hook.sh; - - passthru.libPrefix = "lib/perl5/site_perl"; -} diff --git a/pkgs/development/interpreters/perl/5.8/gcc-4.2.patch b/pkgs/development/interpreters/perl/5.8/gcc-4.2.patch deleted file mode 100644 index 679a7abde3b..00000000000 --- a/pkgs/development/interpreters/perl/5.8/gcc-4.2.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- perl-5.8.x/makedepend.SH 2006-06-13 15:31:22.000000000 -0400 -+++ perl-5.8.x-andy/makedepend.SH 2006-07-25 14:45:11.000000000 -0400 -@@ -167,6 +167,7 @@ - -e '/^#.*<builtin>/d' \ - -e '/^#.*<built-in>/d' \ - -e '/^#.*<command line>/d' \ -+ -e '/^#.*<command-line>/d' \ - -e '/^#.*"-"/d' \ - -e '/: file path prefix .* never used$/d' \ - -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \ diff --git a/pkgs/development/interpreters/perl/5.8/no-sys-dirs.patch b/pkgs/development/interpreters/perl/5.8/no-sys-dirs.patch deleted file mode 100644 index 48588d5a429..00000000000 --- a/pkgs/development/interpreters/perl/5.8/no-sys-dirs.patch +++ /dev/null @@ -1,164 +0,0 @@ -diff -rc perl-orig/Configure perl-5.8.6/Configure -*** perl-orig/Configure 2004-09-10 08:25:52.000000000 +0200 ---- perl-5.8.6/Configure 2005-03-10 12:53:28.000000000 +0100 -*************** -*** 86,100 **** - fi - - : Proper PATH setting -! paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin' -! paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin" -! paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin" -! paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" -! paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" -! paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin" -! paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib" -! paths="$paths /sbin /usr/sbin /usr/libexec" -! paths="$paths /system/gnu_library/bin" - - for p in $paths - do ---- 86,92 ---- - fi - - : Proper PATH setting -! paths='' - - for p in $paths - do -*************** -*** 1221,1228 **** - archname='' - : Possible local include directories to search. - : Set locincpth to "" in a hint file to defeat local include searches. -! locincpth="/usr/local/include /opt/local/include /usr/gnu/include" -! locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include" - : - : no include file wanted by default - inclwanted='' ---- 1213,1219 ---- - archname='' - : Possible local include directories to search. - : Set locincpth to "" in a hint file to defeat local include searches. -! locincpth="" - : - : no include file wanted by default - inclwanted='' -*************** -*** 1230,1245 **** - groupstype='' - libnames='' - : change the next line if compiling for Xenix/286 on Xenix/386 -! xlibpth='/usr/lib/386 /lib/386' - : Possible local library directories to search. -! loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" -! loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" - - : general looking path for locating libraries -! glibpth="/lib /usr/lib $xlibpth" -! glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" -! test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" -! test -f /shlib/libc.so && glibpth="/shlib $glibpth" - - : Private path used by Configure to find libraries. Its value - : is prepended to libpth. This variable takes care of special ---- 1221,1232 ---- - groupstype='' - libnames='' - : change the next line if compiling for Xenix/286 on Xenix/386 -! xlibpth='' - : Possible local library directories to search. -! loclibpth="" - - : general looking path for locating libraries -! glibpth="$xlibpth" - - : Private path used by Configure to find libraries. Its value - : is prepended to libpth. This variable takes care of special -*************** -*** 1270,1277 **** - libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" - : We probably want to search /usr/shlib before most other libraries. - : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. -- glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` -- glibpth="/usr/shlib $glibpth" - : Do not use vfork unless overridden by a hint file. - usevfork=false - ---- 1257,1262 ---- -*************** -*** 2267,2273 **** - zip - " - pth=`echo $PATH | sed -e "s/$p_/ /g"` -- pth="$pth /lib /usr/lib" - for file in $loclist; do - eval xxx=\$$file - case "$xxx" in ---- 2252,2257 ---- -*************** -*** 7910,7922 **** - echo " " - case "$sysman" in - '') -! syspath='/usr/share/man/man1 /usr/man/man1' -! syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1" -! syspath="$syspath /usr/man/u_man/man1" -! syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1" -! syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1" -! syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1" -! sysman=`./loc . /usr/man/man1 $syspath` - ;; - esac - if $test -d "$sysman"; then ---- 7894,7901 ---- - echo " " - case "$sysman" in - '') -! syspath='' -! sysman='' - ;; - esac - if $test -d "$sysman"; then -*************** -*** 17949,17957 **** - case "$full_ar" in - '') full_ar=$ar ;; - esac - - : Store the full pathname to the sed program for use in the C program -! full_sed=$sed - - : see what type gids are declared as in the kernel - echo " " ---- 17928,17937 ---- - case "$full_ar" in - '') full_ar=$ar ;; - esac -+ full_ar=ar - - : Store the full pathname to the sed program for use in the C program -! full_sed=sed - - : see what type gids are declared as in the kernel - echo " " -diff -rc perl-orig/ext/Errno/Errno_pm.PL perl-5.8.6/ext/Errno/Errno_pm.PL -*** perl-orig/ext/Errno/Errno_pm.PL 2004-11-01 15:31:59.000000000 +0100 ---- perl-5.8.6/ext/Errno/Errno_pm.PL 2005-03-10 12:52:31.000000000 +0100 -*************** -*** 105,111 **** - # Watch out for cross compiling for EPOC (usually done on linux) - $file{'/usr/local/epocemx/epocsdk/include/libc/sys/errno.h'} = 1; - } elsif ($^O eq 'linux' && -! $Config{gccversion} ne '' # might be using, say, Intel's icc - ) { - # Some Linuxes have weird errno.hs which generate - # no #file or #line directives ---- 105,111 ---- - # Watch out for cross compiling for EPOC (usually done on linux) - $file{'/usr/local/epocemx/epocsdk/include/libc/sys/errno.h'} = 1; - } elsif ($^O eq 'linux' && -! $Config{gccversion} eq '' # might be using, say, Intel's icc - ) { - # Some Linuxes have weird errno.hs which generate - # no #file or #line directives diff --git a/pkgs/development/interpreters/perl/5.8/setup-hook.sh b/pkgs/development/interpreters/perl/5.8/setup-hook.sh deleted file mode 100644 index 75a394c3c0a..00000000000 --- a/pkgs/development/interpreters/perl/5.8/setup-hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -addPerlLibPath () { - addToSearchPath PERL5LIB $1/lib/site_perl -} - -envHooks+=(addPerlLibPath) diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix index ed5feeacf61..c1d02064fe1 100644 --- a/pkgs/development/interpreters/php/5.3.nix +++ b/pkgs/development/interpreters/php/5.3.nix @@ -233,7 +233,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; meta = { - description = "The PHP language runtime engine"; + description = "An HTML-embedded scripting language"; homepage = http://www.php.net/; license = "PHP-3"; maintainers = with stdenv.lib.maintainers; [ lovek323 ]; diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index bc5320ff77c..e39661b224a 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -77,6 +77,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) buildInputs = [ postgresql ]; }; + pdo_pgsql = { + configureFlags = ["--with-pdo-pgsql=${postgresql}"]; + buildInputs = [ postgresql ]; + }; + mysql = { configureFlags = ["--with-mysql=${mysql}"]; buildInputs = [ mysql ]; @@ -203,6 +208,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) gettextSupport = config.php.gettext or true; pcntlSupport = config.php.pcntl or true; postgresqlSupport = config.php.postgresql or true; + pdo_pgsqlSupport = config.php.pdo_pgsql or true; readlineSupport = config.php.readline or true; sqliteSupport = config.php.sqlite or true; soapSupport = config.php.soap or true; @@ -247,7 +253,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; meta = { - description = "The PHP language runtime engine"; + description = "An HTML-embedded scripting language"; homepage = http://www.php.net/; license = "PHP-3"; }; diff --git a/pkgs/development/interpreters/pypy/2.3/default.nix b/pkgs/development/interpreters/pypy/2.3/default.nix index d67f1c2a821..0ed13e2f646 100644 --- a/pkgs/development/interpreters/pypy/2.3/default.nix +++ b/pkgs/development/interpreters/pypy/2.3/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi -, sqlite, openssl, ncurses, pythonFull, expat }: +, sqlite, openssl, ncurses, pythonFull, expat, tcl, tk, x11, libX11 }: assert zlibSupport -> zlib != null; @@ -20,7 +20,7 @@ let sha256 = "0fg4l48c7n59n5j3b1dgcsr927xzylkfny4a6pnk6z0pq2bhvl9z"; }; - buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite ] + buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl x11 libX11 ] ++ stdenv.lib.optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ stdenv.lib.optional zlibSupport zlib; @@ -40,12 +40,20 @@ let substituteInPlace pypy/goal/targetpypystandalone.py \ --replace "/usr/bin/env pypy" "${pythonFull}/bin/python" - # convince pypy to find nix ncurses + # hint pypy to find nix ncurses substituteInPlace pypy/module/_minimal_curses/fficurses.py \ --replace "/usr/include/ncurses/curses.h" "${ncurses}/include/curses.h" \ --replace "ncurses/curses.h" "${ncurses}/include/curses.h" \ --replace "ncurses/term.h" "${ncurses}/include/term.h" \ --replace "libraries=['curses']" "libraries=['ncurses']" + + # tkinter hints + substituteInPlace lib_pypy/_tkinter/tklib.py \ + --replace "'/usr/include/tcl'" "'${tk}/include', '${tcl}/include'" \ + --replace "linklibs=['tcl', 'tk']" "linklibs=['tcl8.5', 'tk8.5']" \ + --replace "libdirs = []" "libdirs = ['${tk}/lib', '${tcl}/lib']" + + sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite}/include'], library_dirs=['${sqlite}/lib']@" lib_pypy/_sqlite3.py ''; setupHook = ./setup-hook.sh; @@ -58,8 +66,8 @@ let # disable shutils because it assumes gid 0 exists # disable socket because it has two actual network tests that fail # disable test_mhlib because it fails for unknown reason - # disable test_multiprocessing due to transient errors # disable sqlite3 due to https://bugs.pypy.org/issue1740 + # disable test_multiprocessing due to transient errors # disable test_os because test_urandom_failure fails ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_sqlite -test_socket -test_os -test_shutil -test_mhlib -test_multiprocessing' lib-python ''; @@ -75,19 +83,23 @@ let ln -s $out/pypy-c/include $out/include/${libPrefix} ln -s $out/pypy-c/lib-python/${pythonVersion} $out/lib/${libPrefix} + # verify cffi modules + $out/bin/pypy -c "import Tkinter;import sqlite3" + # TODO: compile python files? ''; passthru = { inherit zlibSupport libPrefix; executable = "pypy"; + isPypy = true; }; enableParallelBuilding = true; meta = with stdenv.lib; { homepage = "http://pypy.org/"; - description = "PyPy is a fast, compliant alternative implementation of the Python language (2.7.3)"; + description = "Fast, compliant alternative implementation of the Python language (2.7.3)"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ iElectric ]; diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 84492e09386..6ec0f4f73e5 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -3,180 +3,141 @@ g: # Get dependencies from patched gems { aliases = { - ZenTest = g.ZenTest_4_9_3; - actionmailer = g.actionmailer_4_0_0; - actionpack = g.actionpack_4_0_0; - activemodel = g.activemodel_4_0_0; - activerecord = g.activerecord_4_0_0; - activerecord_deprecated_finders = g.activerecord_deprecated_finders_1_0_3; - activesupport = g.activesupport_4_0_0; - addressable = g.addressable_2_3_5; - arel = g.arel_4_0_0; - atomic = g.atomic_1_1_14; + ZenTest = g.ZenTest_4_10_1; + actionmailer = g.actionmailer_4_1_5; + actionpack = g.actionpack_4_1_5; + actionview = g.actionview_4_1_5; + activemodel = g.activemodel_4_1_5; + activerecord = g.activerecord_4_1_5; + activesupport = g.activesupport_4_1_5; + addressable = g.addressable_2_3_6; + arel = g.arel_5_0_1_20140414130214; atoulme_Antwrap = g.atoulme_Antwrap_0_7_4; - autotest_rails = g.autotest_rails_4_1_2; - aws_sdk = g.aws_sdk_1_16_1; - backports = g.backports_3_3_3; - bitbucket_backup = g.bitbucket_backup_0_3_0; + autotest_rails = g.autotest_rails_4_2_1; + aws_sdk = g.aws_sdk_1_51_0; + backports = g.backports_3_6_0; + bitbucket_backup = g.bitbucket_backup_0_3_1; builder = g.builder_3_2_2; - buildr = g.buildr_1_4_12; - bundler = g.bundler_1_3_5; - celluloid = g.celluloid_0_15_2; - childprocess = g.childprocess_0_3_9; - chronic = g.chronic_0_10_1; - classifier = g.classifier_1_3_3; - coderay = g.coderay_1_0_9; - coffee_rails = g.coffee_rails_4_0_1; - coffee_script = g.coffee_script_2_2_0; - coffee_script_source = g.coffee_script_source_1_6_3; - colorator = g.colorator_0_1; - commander = g.commander_4_1_5; - cucumber = g.cucumber_1_3_8; + buildr = g.buildr_1_4_19; + bundler = g.bundler_1_7_1; + childprocess = g.childprocess_0_5_3; + chronic = g.chronic_0_10_2; + coderay = g.coderay_1_1_0; + cucumber = g.cucumber_1_3_16; daemons = g.daemons_1_1_9; - diff_lcs = g.diff_lcs_1_1_3; + diff_lcs = g.diff_lcs_1_2_5; dimensions = g.dimensions_1_2_0; - domain_name = g.domain_name_0_5_13; - dotenv = g.dotenv_0_9_0; + domain_name = g.domain_name_0_5_20; + dotenv = g.dotenv_0_11_1; + dotenv_deployment = g.dotenv_deployment_0_0_2; em_resolv_replace = g.em_resolv_replace_1_1_3; erubis = g.erubis_2_7_0; - ethon = g.ethon_0_6_1; + ethon = g.ethon_0_7_1; eventmachine = g.eventmachine_1_0_3; eventmachine_tail = g.eventmachine_tail_0_6_4; - excon = g.excon_0_25_3; - execjs = g.execjs_2_0_2; - fakes3 = g.fakes3_0_1_5; - faraday = g.faraday_0_8_8; - faraday_middleware = g.faraday_middleware_0_9_0; - fast_stemmer = g.fast_stemmer_1_0_2; - ffi = g.ffi_1_9_0; + fakes3 = g.fakes3_0_1_5_2; + faraday = g.faraday_0_9_0; + faraday_middleware = g.faraday_middleware_0_9_1; + ffi = g.ffi_1_9_3; file_tail = g.file_tail_1_0_12; - foreman = g.foreman_0_63_0; - formatador = g.formatador_0_2_4; - gettext = g.gettext_3_0_0; - gh = g.gh_0_12_0; - gherkin = g.gherkin_2_12_1; - guard = g.guard_2_2_4; - highline = g.highline_1_6_19; + foreman = g.foreman_0_74_0; + gettext = g.gettext_3_1_3; + gh = g.gh_0_13_2; + gherkin = g.gherkin_2_12_2; + highline = g.highline_1_6_21; hike = g.hike_1_2_3; - hoe = g.hoe_3_1_0; - http_cookie = g.http_cookie_1_0_1; - i18n = g.i18n_0_6_5; - iconv = g.iconv_1_0_3; - jekyll = g.jekyll_1_3_0; - jquery_rails = g.jquery_rails_3_0_4; - jruby_pageant = g.jruby_pageant_1_1_1; - jsduck = g.jsduck_5_1_0; - json = g.json_1_8_0; + hoe = g.hoe_3_7_1; + http_cookie = g.http_cookie_1_0_2; + i18n = g.i18n_0_6_11; + iconv = g.iconv_1_0_4; + jsduck = g.jsduck_5_3_4; + json = g.json_1_8_1; json_pure = g.json_pure_1_8_0; - launchy = g.launchy_2_3_0; - liquid = g.liquid_2_5_4; - listen = g.listen_2_2_0; - locale = g.locale_2_0_8; - lockfile = g.lockfile_2_1_0; - lumberjack = g.lumberjack_1_0_4; - macaddr = g.macaddr_1_6_1; - maruku = g.maruku_0_6_1; - mail = g.mail_2_5_4; - mechanize = g.mechanize_2_7_2; + launchy = g.launchy_2_4_2; + locale = g.locale_2_1_0; + lockfile = g.lockfile_2_1_3; + macaddr = g.macaddr_1_7_1; + mail = g.mail_2_6_1; + mechanize = g.mechanize_2_7_3; method_source = g.method_source_0_8_2; - mime_types = g.mime_types_1_25; - mini_portile = g.mini_portile_0_5_1; - minitar = g.minitar_0_5_3; - minitest = g.minitest_4_7_5; - mono_logger = g.mono_logger_1_1_0; - multi_json = g.multi_json_1_8_2; - multi_test = g.multi_test_0_0_2; - multipart_post = g.multipart_post_1_2_0; + mime_types = g.mime_types_2_3; + mini_portile = g.mini_portile_0_6_0; + minitar = g.minitar_0_5_4; + minitest = g.minitest_5_4_0; + multi_json = g.multi_json_1_10_1; + multi_test = g.multi_test_0_1_1; + multipart_post = g.multipart_post_2_0_0; net_http_digest_auth = g.net_http_digest_auth_1_4; - net_http_persistent = g.net_http_persistent_2_9; + net_http_persistent = g.net_http_persistent_2_9_4; net_http_pipeline = g.net_http_pipeline_1_0_1; - net_sftp = g.net_sftp_2_0_5; - net_ssh = g.net_ssh_2_6_8; - netrc = g.netrc_0_7_7; + net_sftp = g.net_sftp_2_1_2; + net_ssh = g.net_ssh_2_9_1; nix = g.nix_0_1_1; - nokogiri = g.nokogiri_1_6_0; + nokogiri = g.nokogiri_1_6_3_1; ntlm_http = g.ntlm_http_0_1_1; - papertrail = g.papertrail_0_9_7; + orderedhash = g.orderedhash_0_0_6; + papertrail = g.papertrail_0_9_10; papertrail_cli = g.papertrail_cli_0_9_3; parallel = g.parallel_0_7_1; - polyglot = g.polyglot_0_3_3; - posix_spawn = g.posix_spawn_0_3_6; - pry = g.pry_0_9_12_2; - pusher_client = g.pusher_client_0_3_1; + polyglot = g.polyglot_0_3_5; + pry = g.pry_0_9_12_6; + pusher_client = g.pusher_client_0_6_0; rack = g.rack_1_5_2; - rack_protection = g.rack_protection_1_5_1; - rails = g.rails_4_0_0; - railties = g.railties_4_0_0; - rake = g.rake_10_1_0; - rb_fsevent = g.rb_fsevent_0_9_3; - rb_inotify = g.rb_inotify_0_9_2; - rb_kqueue = g.rb_kqueue_0_2_0; - rdiscount = g.rdiscount_2_1_6; - redcarpet = g.redcarpet_2_3_0; - redis = g.redis_3_0_5; - redis_namespace = g.redis_namespace_1_3_1; + rack_protection = g.rack_protection_1_5_3; + rack_test = g.rack_test_0_6_2; + rails = g.rails_4_1_5; + railties = g.railties_4_1_5; + rake = g.rake_10_3_2; + rb_fsevent = g.rb_fsevent_0_9_4; + rdiscount = g.rdiscount_2_1_7_1; remote_syslog = g.remote_syslog_1_6_14; - resque = g.resque_1_25_1; - resque_web = g.resque_web_0_0_3; - 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_4_0; - rjb = g.rjb_1_4_8; - rkelly_remix = g.rkelly_remix_0_0_4; - rmagick = g.rmagick_2_13_2; + right_http_connection = g.right_http_connection_1_5_0; + rjb = g.rjb_1_4_9; + rkelly_remix = g.rkelly_remix_0_0_6; rmail = g.rmail_1_0_0; - rmail_sup = g.rmail_sup_1_0_1; - rspec = g.rspec_2_11_0; - rspec_core = g.rspec_core_2_11_1; - rspec_expectations = g.rspec_expectations_2_11_3; - rspec_mocks = g.rspec_mocks_2_11_3; - ruby_hmac = g.ruby_hmac_0_4_0; - rubyforge = g.rubyforge_2_0_4; - rubyzip = g.rubyzip_0_9_9; - safe_yaml = g.safe_yaml_0_9_7; - sass = g.sass_3_2_12; - sass_rails = g.sass_rails_4_0_1; - selenium_webdriver = g.selenium_webdriver_2_35_1; + rspec = g.rspec_2_14_1; + rspec_core = g.rspec_core_2_14_8; + rspec_expectations = g.rspec_expectations_2_14_5; + rspec_mocks = g.rspec_mocks_2_14_6; + rubyzip = g.rubyzip_1_1_6; + sass = g.sass_3_4_1; + selenium_webdriver = g.selenium_webdriver_2_42_0; servolux = g.servolux_0_10_0; - sinatra = g.sinatra_1_4_4; - slop = g.slop_3_4_6; - sprockets = g.sprockets_2_10_0; - sprockets_rails = g.sprockets_rails_2_0_1; - syntax = g.syntax_1_0_0; + sinatra = g.sinatra_1_4_5; + slop = g.slop_3_6_0; + sprockets = g.sprockets_2_12_1; + sprockets_rails = g.sprockets_rails_2_1_3; syslog_protocol = g.syslog_protocol_0_9_2; - systemu = g.systemu_2_5_2; + systemu = g.systemu_2_6_4; taskjuggler = g.taskjuggler_3_5_0; - term_ansicolor = g.term_ansicolor_1_2_2; - terminal_notifier = g.terminal_notifier_1_5_1; - text = g.text_1_2_3; - thin = g.thin_1_5_1; - thor = g.thor_0_18_1; - thread_safe = g.thread_safe_0_1_3; + term_ansicolor = g.term_ansicolor_1_3_0; + terminal_notifier = g.terminal_notifier_1_6_1; + text = g.text_1_3_0; + thin = g.thin_1_6_2; + thor = g.thor_0_19_1; + thread_safe = g.thread_safe_0_3_4; tilt = g.tilt_1_4_1; - timers = g.timers_1_1_0; - tins = g.tins_0_9_0; - travis = g.travis_1_5_3; + tins = g.tins_1_3_2; + travis = g.travis_1_7_1; treetop = g.treetop_1_4_15; trollop = g.trollop_2_0; - twitter_bootstrap_rails = g.twitter_bootstrap_rails_2_2_8; - typhoeus = g.typhoeus_0_6_5; - tzinfo = g.tzinfo_0_3_38; - unf = g.unf_0_1_2; + typhoeus = g.typhoeus_0_6_9; + tzinfo = g.tzinfo_1_2_2; + unf = g.unf_0_1_4; unf_ext = g.unf_ext_0_0_6; - unicode = g.unicode_0_4_4; uuid = g.uuid_2_3_7; - uuidtools = g.uuidtools_2_1_4; - vegas = g.vegas_0_1_11; + webrick = g.webrick_1_3_1; webrobots = g.webrobots_0_1_1; - websocket = g.websocket_1_0_7; + websocket = g.websocket_1_2_0; xapian_full = g.xapian_full_1_2_3; - xapian_ruby = g.xapian_ruby_1_2_15_1; - xml_simple = g.xml_simple_1_1_1; - yajl_ruby = g.yajl_ruby_1_1_0; + xapian_ruby = g.xapian_ruby_1_2_17; + xml_simple = g.xml_simple_1_1_2; }; - gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''cucumber'' ''fakes3'' ''foreman'' ''gettext'' ''iconv'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''thin'' ''travis'' ''trollop'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ]; + gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''cucumber'' ''fakes3'' ''foreman'' ''gettext'' ''iconv'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''riemann-dash'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''terminal-notifier'' ''thin'' ''travis'' ''trollop'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ]; gems = { - ZenTest_4_9_3 = { + ZenTest_4_10_1 = { basename = ''ZenTest''; meta = { description = ''ZenTest provides 4 different tools: zentest, unit_diff, autotest, and multiruby''; @@ -203,77 +164,77 @@ 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.9.3''; + name = ''ZenTest-4.10.1''; requiredGems = [ ]; - sha256 = ''0rd07scqhdy9sfygbgbdick895pk4pbamcl70hr78cylhqpk6m38''; + sha256 = ''1jyk0lag27s71idna2h72ljskimj0snsiw7diyjx5rqxnz6fj7z1''; }; - actionmailer_4_0_0 = { + actionmailer_4_1_5 = { 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.0.0''; - requiredGems = [ g.actionpack_4_0_0 g.mail_2_5_4 ]; - sha256 = ''0d63hmddll0vdbzzxj4zl6njv1pm7j2njvqfccvvyypwsynfjkgk''; + name = ''actionmailer-4.1.5''; + requiredGems = [ g.actionpack_4_1_5 g.actionview_4_1_5 g.mail_2_5_4 ]; + sha256 = ''19frz9njy6jbxh7yasx62l4ifns3dxfkfqvnxlqb4pwsz7lqcp9c''; }; - actionpack_4_0_0 = { + actionpack_4_1_5 = { 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.0.0''; - requiredGems = [ g.activesupport_4_0_0 g.builder_3_1_4 g.rack_1_5_2 g.rack_test_0_6_2 g.erubis_2_7_0 ]; - sha256 = ''0hx9hdbqqm73l81p5r520zdk218739414yhw9yrys905ks2f5j4d''; + name = ''actionpack-4.1.5''; + requiredGems = [ g.activesupport_4_1_5 g.rack_1_5_2 g.rack_test_0_6_2 g.actionview_4_1_5 ]; + sha256 = ''05wh3c5rw3c0rsza3bnpmr6s63n481d4gkbhsp3ngwn9lpp3jdb6''; }; - activemodel_4_0_0 = { + actionview_4_1_5 = { + 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.5''; + requiredGems = [ g.activesupport_4_1_5 g.builder_3_2_2 g.erubis_2_7_0 ]; + sha256 = ''02zb4xi2farzh892j9awxshyly7ijlvbj39g6cwq5mhs5cx59qk8''; + }; + activemodel_4_1_5 = { 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, observers, serialization, internationalization, and testing.''; + longDescription = ''A toolkit for building modeling frameworks like Active Record. Rich support for attributes, callbacks, validations, serialization, internationalization, and testing.''; }; - name = ''activemodel-4.0.0''; - requiredGems = [ g.activesupport_4_0_0 g.builder_3_1_4 ]; - sha256 = ''0vsq5bzsyfrzgnhizlipivmh7m9p0ky29avx47wnaqwjlpkir5m2''; + name = ''activemodel-4.1.5''; + requiredGems = [ g.activesupport_4_1_5 g.builder_3_2_2 ]; + sha256 = ''1anbjwdfgdjfxiv5vzysrdd98mapvd2h8xjkayq3vq54n13ymjvl''; }; - activerecord_4_0_0 = { + activerecord_4_1_5 = { 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.0.0''; - requiredGems = [ g.activesupport_4_0_0 g.activemodel_4_0_0 g.arel_4_0_0 g.activerecord_deprecated_finders_1_0_3 ]; - sha256 = ''0lhksb0172kz23yhibr1rxihyp01h2ajqxd0l4nahs2qc9jlr722''; - }; - activerecord_deprecated_finders_1_0_3 = { - basename = ''activerecord_deprecated_finders''; - meta = { - description = ''This gem contains deprecated finder APIs extracted from Active Record.''; - homepage = ''https://github.com/rails/activerecord-deprecated_finders''; - longDescription = ''Deprecated finder APIs extracted from Active Record.''; - }; - name = ''activerecord-deprecated_finders-1.0.3''; - requiredGems = [ ]; - sha256 = ''1z2g7h2ywhplrsjrsh8961agf17s9rj8ypdwjj482mw86if3dslp''; + name = ''activerecord-4.1.5''; + requiredGems = [ g.activesupport_4_1_5 g.activemodel_4_1_5 g.arel_5_0_1_20140414130214 ]; + sha256 = ''1z8awkkl4bn4ghdp432n2qpagbb8569ffq63kmgkbwf8127kmzrc''; }; - activesupport_4_0_0 = { + activesupport_4_1_5 = { 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.0.0''; - requiredGems = [ g.i18n_0_6_5 g.multi_json_1_7_9 g.tzinfo_0_3_37 g.minitest_4_7_5 g.thread_safe_0_1_2 ]; - sha256 = ''0agxkvjhhv6r9rpm0lcgjny4sn1ihhvhlgs46rgi3fz0y1d93ids''; + name = ''activesupport-4.1.5''; + requiredGems = [ g.i18n_0_6_11 g.json_1_8_1 g.tzinfo_1_2_2 g.minitest_5_4_0 g.thread_safe_0_3_4 ]; + sha256 = ''0vmf58q96469dci509hhbqxwr7gaxq4yjsb37xd56ggpqn3qm30k''; }; - addressable_2_3_5 = { + addressable_2_3_6 = { basename = ''addressable''; meta = { description = ''URI Implementation''; @@ -283,11 +244,11 @@ Ruby's standard library. It more closely conforms to the relevant RFCs and adds support for IRIs and URI templates. ''; }; - name = ''addressable-2.3.5''; + name = ''addressable-2.3.6''; requiredGems = [ ]; - sha256 = ''11hv69v6h39j7m4v51a4p7my7xwjbhxbsg3y7ja156z7by10wkg7''; + sha256 = ''137fj0whmn1kvaq8wjalp8x4qbblwzvg3g4bfx8d8lfi6f0w48p8''; }; - arel_4_0_0 = { + arel_5_0_1_20140414130214 = { basename = ''arel''; meta = { description = ''Arel is a SQL AST manager for Ruby''; @@ -295,37 +256,15 @@ adds support for IRIs and URI templates. longDescription = ''Arel is a SQL AST manager for Ruby. It 1. Simplifies the generation of complex SQL queries -2. Adapts to various RDBMS systems +2. Adapts to various RDBMSes It is intended to be a framework framework; that is, you can build your own ORM with it, focusing on innovative object and collection modeling as opposed to database compatibility and query generation.''; }; - name = ''arel-4.0.0''; + name = ''arel-5.0.1.20140414130214''; requiredGems = [ ]; - sha256 = ''19xzg8jhp4p18xlf6sp4yhf6vdpc3hl8lm23n6glikclm7rvgick''; - }; - atomic_1_1_13 = { - basename = ''atomic''; - meta = { - description = ''An atomic reference implementation for JRuby, Rubinius, and MRI''; - homepage = ''http://github.com/headius/ruby-atomic''; - longDescription = ''An atomic reference implementation for JRuby, Rubinius, and MRI''; - }; - name = ''atomic-1.1.13''; - requiredGems = [ ]; - sha256 = ''0sdy8fcncm6p2cba3p8v7dnbsa4z41f4cs1dd0myf4fq7axrrh0s''; - }; - atomic_1_1_14 = { - basename = ''atomic''; - meta = { - description = ''An atomic reference implementation for JRuby, Rubinius, and MRI''; - homepage = ''http://github.com/headius/ruby-atomic''; - longDescription = ''An atomic reference implementation for JRuby, Rubinius, and MRI''; - }; - name = ''atomic-1.1.14''; - requiredGems = [ ]; - sha256 = ''09dzi1gxr5yj273s6s6ss7l2sq4ayavpg95561kib3n4kzvxrhk4''; + sha256 = ''0dhnc20h1v8ml3nmkxq92rr7qxxpk6ixhwvwhgl2dbw9mmxz0hf9''; }; atoulme_Antwrap_0_7_4 = { basename = ''atoulme_Antwrap''; @@ -346,10 +285,10 @@ database compatibility and query generation.''; check out Buildr!''; }; name = ''atoulme-Antwrap-0.7.4''; - requiredGems = [ g.rjb_1_4_8 ]; + requiredGems = [ g.rjb_1_4_9 ]; sha256 = ''0sh9capkya88qm9mvixwly32fwb2c4nzif9j9vv0f73rqw8kz4j4''; }; - autotest_rails_4_1_2 = { + autotest_rails_4_2_1 = { basename = ''autotest_rails''; meta = { description = ''This is an autotest plugin to provide rails support''; @@ -357,74 +296,42 @@ database compatibility and query generation.''; longDescription = ''This is an autotest plugin to provide rails support. It provides basic rails support and extra plugins for migrations and fixtures.''; }; - name = ''autotest-rails-4.1.2''; - requiredGems = [ g.ZenTest_4_9_3 ]; - sha256 = ''1wkb5jayb39yx0i8ly7sibygf9f9c3w24jg2z1qgm135zlb070v4''; + name = ''autotest-rails-4.2.1''; + requiredGems = [ g.ZenTest_4_10_1 ]; + sha256 = ''1v1dm9zlhdlrxvk90zs8d439ldar674ix41s7pncddgyswcfgg5l''; }; - aws_sdk_1_16_1 = { + aws_sdk_1_51_0 = { basename = ''aws_sdk''; meta = { description = ''AWS SDK for Ruby''; homepage = ''http://aws.amazon.com/sdkforruby''; longDescription = ''AWS SDK for Ruby''; }; - name = ''aws-sdk-1.16.1''; - requiredGems = [ g.uuidtools_2_1_4 g.nokogiri_1_5_10 g.json_1_8_0 ]; - sha256 = ''1i6njmzfcmjb9xdaqw727pdqr17w3gad1nl5zln4mv6i4x0nbc3n''; + name = ''aws-sdk-1.51.0''; + requiredGems = [ g.nokogiri_1_6_3_1 g.json_1_8_1 ]; + sha256 = ''092a7km6ar7zvyyzgiqsb0dm354sqa6mzx7sa0c8ndwm918lbqai''; }; - backports_3_3_3 = { + backports_3_6_0 = { 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.0.0 for earlier versions.''; }; - name = ''backports-3.3.3''; + name = ''backports-3.6.0''; requiredGems = [ ]; - sha256 = ''0y1la483wlv7gam1470shskc0bjsif9hld6qikx165yw9gmbgxsy''; + sha256 = ''1pinn0m4fmq124adc6xjl2hk9799xq5jw4bva82cdzd4h2hwrgq5''; }; - bitbucket_backup_0_3_0 = { + bitbucket_backup_0_3_1 = { basename = ''bitbucket_backup''; meta = { description = ''A tool to backup Bitbucket repos.''; homepage = ''https://bitbucket.org/seth/bitbucket-backup''; longDescription = ''A tool to backup Bitbucket repos.''; }; - name = ''bitbucket-backup-0.3.0''; - requiredGems = [ g.highline_1_6_19 g.json_1_8_0 ]; - sha256 = ''075bz4bhxim2kh5191qc9kpq7z81aa2smgqq5bfldjqvk70hr87y''; - }; - builder_3_1_3 = { - basename = ''builder''; - meta = { - description = ''Builders for MarkUp.''; - homepage = ''http://onestepback.org''; - longDescription = ''Builder provides a number of builder objects that make creating structured data -simple to do. Currently the following builder objects are supported: - -* XML Markup -* XML Events -''; - }; - name = ''builder-3.1.3''; - requiredGems = [ ]; - sha256 = ''0w6xsq9vyvzdy0xb52sajgipr9ml2bbpivk6dxm69c6987dk7him''; - }; - builder_3_1_4 = { - basename = ''builder''; - meta = { - description = ''Builders for MarkUp.''; - homepage = ''http://onestepback.org''; - longDescription = ''Builder provides a number of builder objects that make creating structured data -simple to do. Currently the following builder objects are supported: - -* XML Markup -* XML Events -''; - }; - name = ''builder-3.1.4''; - requiredGems = [ ]; - sha256 = ''1p0bjy1vb0zbswd6bsh5qda0f0br53p8vak8cm7hls62094r405p''; + name = ''bitbucket-backup-0.3.1''; + requiredGems = [ g.highline_1_6_21 g.json_1_8_1 ]; + sha256 = ''17d2pfk0z3cxcx9m90avcp5wxhdbrq23zd665263m3hh9b5qi0fj''; }; builder_3_2_2 = { basename = ''builder''; @@ -442,7 +349,7 @@ simple to do. Currently the following builder objects are supported: requiredGems = [ ]; sha256 = ''14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2''; }; - buildr_1_4_12 = { + buildr_1_4_19 = { basename = ''buildr''; meta = { description = ''Build like you code''; @@ -454,87 +361,42 @@ to do, and it takes care of the rest. But also something we can easily extend for those one-off tasks, with a language that's a joy to use. ''; }; - name = ''buildr-1.4.12''; - requiredGems = [ g.rake_0_9_2_2 g.builder_3_1_3 g.net_ssh_2_6_0 g.net_sftp_2_0_5 g.rubyzip_0_9_9 g.highline_1_6_2 g.json_pure_1_7_5 g.rubyforge_2_0_4 g.hoe_3_1_0 g.rjb_1_4_2 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_1_3 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 g.rspec_core_2_11_1 g.rspec_2_11_0 g.xml_simple_1_1_1 g.minitar_0_5_3 g.bundler_1_3_5 ]; - sha256 = ''0hsy9bkfp1pq5f3jx8i6fsk0r309nmq778ykk6w103rkrdb3l6s6''; + name = ''buildr-1.4.19''; + 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_8 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_1 g.orderedhash_0_0_6 ]; + sha256 = ''07k6z149si7v1h5m1bvdhjcv0nnjwkd2c6a8n1779l8g47ckccj0''; }; - bundler_1_3_5 = { + bundler_1_7_1 = { basename = ''bundler''; meta = { description = ''The best way to manage your application's dependencies''; - homepage = ''http://gembundler.com''; + homepage = ''http://bundler.io''; longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably''; }; - name = ''bundler-1.3.5''; + name = ''bundler-1.7.1''; requiredGems = [ ]; - sha256 = ''1r7zx8qfwzr3pbgrjbsml7z5qgscwyyv33x2jzhz6adqyx3r1f08''; + sha256 = ''144yqbmi89gl933rh8dv58bm7ia14s4a098qdi2z0q09ank9n5h2''; }; - celluloid_0_15_2 = { - basename = ''celluloid''; - meta = { - description = ''Actor-based concurrent object framework for Ruby''; - homepage = ''https://github.com/celluloid/celluloid''; - longDescription = ''Celluloid enables people to build concurrent programs out of concurrent objects just as easily as they build sequential programs out of sequential objects''; - }; - name = ''celluloid-0.15.2''; - requiredGems = [ g.timers_1_1_0 ]; - sha256 = ''0lpa97m7f4p5hgzaaa47y1d5c78n8pp4xd8qb0sn5llqd0klkd9b''; - }; - childprocess_0_3_9 = { + childprocess_0_5_3 = { 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.3.9''; - requiredGems = [ g.ffi_1_9_0 ]; - sha256 = ''0jbz2ix7ff9ry8717lhcq9w8j8yd45akw48giwgdqccay5mlph7d''; - }; - chronic_0_9_1 = { - basename = ''chronic''; - meta = { - description = ''Natural language date/time parsing.''; - homepage = ''http://github.com/mojombo/chronic''; - longDescription = ''Chronic is a natural language date/time parser written in pure Ruby.''; - }; - name = ''chronic-0.9.1''; - requiredGems = [ ]; - sha256 = ''0kspaxpfy7yvyk1lvpx31w852qfj8wb9z04mcj5bzi70ljb9awqk''; - }; - classifier_1_3_3 = { - basename = ''classifier''; - meta = { - description = ''A general classifier module to allow Bayesian and other types of classifications.''; - homepage = ''http://classifier.rufy.com/''; - longDescription = '' A general classifier module to allow Bayesian and other types of classifications. -''; - }; - name = ''classifier-1.3.3''; - requiredGems = [ g.fast_stemmer_1_0_2 ]; - sha256 = ''1kq1cd8fq6wvyxbjy3r6ya3d3sk3rcp1b560xlqvflpsirm47r9g''; + name = ''childprocess-0.5.3''; + requiredGems = [ g.ffi_1_9_3 ]; + sha256 = ''12djpdr487fddq55sav8gw1pjglcbb0ab0s6npga0ywgsqdyvsww''; }; - chronic_0_10_1 = { + chronic_0_10_2 = { basename = ''chronic''; meta = { description = ''Natural language date/time parsing.''; homepage = ''http://github.com/mojombo/chronic''; longDescription = ''Chronic is a natural language date/time parser written in pure Ruby.''; }; - name = ''chronic-0.10.1''; - requiredGems = [ ]; - sha256 = ''0p822hry4njncxpf59nrvjayg2pxk1zh8gykjgsmqrphdkqqmp1w''; - }; - coderay_1_0_9 = { - basename = ''coderay''; - meta = { - description = ''Fast syntax highlighting for selected languages.''; - homepage = ''http://coderay.rubychan.de''; - longDescription = ''Fast and easy syntax highlighting for selected languages, written in Ruby. Comes with RedCloth integration and LOC counter.''; - }; - name = ''coderay-1.0.9''; + name = ''chronic-0.10.2''; requiredGems = [ ]; - sha256 = ''1pbjsvd6r2daxd6aicp19fnb1j5z7fxadflsm1h0r33cy3vi7iy8''; + sha256 = ''1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn''; }; coderay_1_1_0 = { basename = ''coderay''; @@ -547,77 +409,16 @@ for those one-off tasks, with a language that's a joy to use. requiredGems = [ ]; sha256 = ''059wkzlap2jlkhg460pkwc1ay4v4clsmg1bp4vfzjzkgwdckr52s''; }; - coffee_rails_4_0_1 = { - basename = ''coffee_rails''; - meta = { - description = ''CoffeeScript adapter for the Rails asset pipeline.''; - homepage = ''https://github.com/rails/coffee-rails''; - longDescription = ''CoffeeScript adapter for the Rails asset pipeline.''; - }; - name = ''coffee-rails-4.0.1''; - requiredGems = [ g.coffee_script_2_2_0 g.railties_4_0_0 ]; - sha256 = ''12nqw61xfs43qap4bxp123q4fgj41gvxirdal95ymdd2qzr3cvig''; - }; - coffee_script_2_2_0 = { - basename = ''coffee_script''; - meta = { - description = ''Ruby CoffeeScript Compiler''; - homepage = ''http://github.com/josh/ruby-coffee-script''; - longDescription = '' Ruby CoffeeScript is a bridge to the JS CoffeeScript compiler. -''; - }; - name = ''coffee-script-2.2.0''; - requiredGems = [ g.coffee_script_source_1_6_3 g.execjs_2_0_2 ]; - sha256 = ''133cp4znfp44wwnv12myw8s0z6qws74ilqmw88iwzkshg689zpdc''; - }; - coffee_script_source_1_6_3 = { - basename = ''coffee_script_source''; - meta = { - description = ''The CoffeeScript Compiler''; - homepage = ''http://jashkenas.github.com/coffee-script/''; - longDescription = '' CoffeeScript is a little language that compiles into JavaScript. - Underneath all of those embarrassing braces and semicolons, - JavaScript has always had a gorgeous object model at its heart. - CoffeeScript is an attempt to expose the good parts of JavaScript - in a simple way. -''; - }; - name = ''coffee-script-source-1.6.3''; - requiredGems = [ ]; - sha256 = ''0p33h0rdj1n8xhm2d5hzqbb8br6wn4rx0gk4hyhc6rxkaxsy79b4''; - }; - colorator_0_1 = { - basename = ''colorator''; - meta = { - description = ''String core extensions for terminal coloring.''; - homepage = ''https://github.com/octopress/colorator''; - longDescription = ''Colorize your text in the terminal.''; - }; - name = ''colorator-0.1''; - requiredGems = [ ]; - sha256 = ''09zp15hyd9wlbgf1kmrf4rnry8cpvh1h9fj7afarlqcy4hrfdpvs''; - }; - commander_4_1_5 = { - basename = ''commander''; - meta = { - description = ''The complete solution for Ruby command-line executables''; - homepage = ''http://visionmedia.github.com/commander''; - longDescription = ''The complete solution for Ruby command-line executables. Commander bridges the gap between other terminal related libraries you know and love (OptionParser, HighLine), while providing many new features, and an elegant API.''; - }; - name = ''commander-4.1.5''; - requiredGems = [ g.highline_1_6_20 ]; - sha256 = ''040x2gjpl55g64kh5f9nby0870hnzx8cd7clxg771z0wjs7nzalc''; - }; - cucumber_1_3_8 = { + cucumber_1_3_16 = { basename = ''cucumber''; meta = { - description = ''cucumber-1.3.8''; + description = ''cucumber-1.3.16''; homepage = ''http://cukes.info''; longDescription = ''Behaviour Driven Development with elegance and joy''; }; - name = ''cucumber-1.3.8''; - requiredGems = [ g.builder_3_2_2 g.diff_lcs_1_2_4 g.gherkin_2_12_1 g.multi_json_1_7_9 g.multi_test_0_0_2 ]; - sha256 = ''0b4igj1vxlcwky11nkrrgg57chbc0n5gmv984dld5s0f1ilkx1ma''; + name = ''cucumber-1.3.16''; + requiredGems = [ g.builder_3_2_2 g.diff_lcs_1_2_5 g.gherkin_2_12_2 g.multi_json_1_10_1 g.multi_test_0_1_1 ]; + sha256 = ''11cjw2d03r41b5pn5in6q822s3v6bpd8isxc9dl7by01jrzi0662''; }; daemons_1_1_9 = { basename = ''daemons''; @@ -630,32 +431,29 @@ for those one-off tasks, with a language that's a joy to use. requiredGems = [ ]; sha256 = ''1j1m64pirsldhic6x6sg4lcrmp1bs1ihpd49xm8m1b2rc1c3irzy''; }; - diff_lcs_1_1_3 = { + diff_lcs_1_2_4 = { basename = ''diff_lcs''; meta = { - description = ''Diff::LCS is a port of Perl's Algorithm::Diff that uses the McIlroy-Hunt longest common subsequence (LCS) algorithm to compute intelligent differences between two sequenced enumerable containers''; - longDescription = ''Diff::LCS is a port of Perl's Algorithm::Diff that uses the McIlroy-Hunt -longest common subsequence (LCS) algorithm to compute intelligent differences -between two sequenced enumerable containers. The implementation is based on -Mario I. Wolczko's {Smalltalk version 1.2}[ftp://st.cs.uiuc.edu/pub/Smalltalk/MANCHESTER/manchester/4.0/diff.st] -(1993) and Ned Konz's Perl version -{Algorithm::Diff 1.15}[http://search.cpan.org/~nedkonz/Algorithm-Diff-1.15/]. + description = ''Diff::LCS computes the difference between two Enumerable sequences using the McIlroy-Hunt longest common subsequence (LCS) algorithm''; + homepage = ''http://diff-lcs.rubyforge.org/''; + longDescription = ''Diff::LCS computes the difference between two Enumerable sequences using the +McIlroy-Hunt longest common subsequence (LCS) algorithm. It includes utilities +to create a simple HTML diff output format and a standard diff-like tool. -This is release 1.1.3, fixing several small bugs found over the years. Version -1.1.0 added new features, including the ability to #patch and #unpatch changes -as well as a new contextual diff callback, Diff::LCS::ContextDiffCallbacks, -that should improve the context sensitivity of patching. +This is release 1.2.4, fixing a bug introduced after diff-lcs 1.1.3 that did +not properly prune common sequences at the beginning of a comparison set. +Thanks to Paul Kunysch for fixing this issue. -This library is called Diff::LCS because of an early version of Algorithm::Diff -which was restrictively licensed. This version has seen a minor license change: -instead of being under Ruby's license as an option, the third optional license -is the MIT license.''; +Coincident with the release of diff-lcs 1.2.3, we reported an issue with +Rubinius in 1.9 mode +({rubinius/rubinius#2268}[https://github.com/rubinius/rubinius/issues/2268]). +We are happy to report that this issue has been resolved.''; }; - name = ''diff-lcs-1.1.3''; + name = ''diff-lcs-1.2.4''; requiredGems = [ ]; - sha256 = ''15wqs3md9slif6ag43vp6gw63r3a2zdqiyfapnnzkb7amgg930pv''; + sha256 = ''09xbffjg639y8n43zp88ki0m489vv2c86znmfib2fg1di6svi1xd''; }; - diff_lcs_1_2_4 = { + diff_lcs_1_2_5 = { basename = ''diff_lcs''; meta = { description = ''Diff::LCS computes the difference between two Enumerable sequences using the McIlroy-Hunt longest common subsequence (LCS) algorithm''; @@ -673,9 +471,9 @@ Rubinius in 1.9 mode ({rubinius/rubinius#2268}[https://github.com/rubinius/rubinius/issues/2268]). We are happy to report that this issue has been resolved.''; }; - name = ''diff-lcs-1.2.4''; + name = ''diff-lcs-1.2.5''; requiredGems = [ ]; - sha256 = ''09xbffjg639y8n43zp88ki0m489vv2c86znmfib2fg1di6svi1xd''; + sha256 = ''1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1''; }; dimensions_1_2_0 = { basename = ''dimensions''; @@ -688,7 +486,7 @@ We are happy to report that this issue has been resolved.''; requiredGems = [ ]; sha256 = ''1pqb7yzjcpbgbyi196ifqbd1wy570cn12bkzcvpcha4xilhajja0''; }; - domain_name_0_5_13 = { + domain_name_0_5_20 = { basename = ''domain_name''; meta = { description = ''Domain Name manipulation library for Ruby''; @@ -699,20 +497,30 @@ It can also be used for cookie domain validation based on the Public Suffix List. ''; }; - name = ''domain_name-0.5.13''; - requiredGems = [ g.unf_0_1_2 ]; - sha256 = ''0m57vacj2bmdfp094gjylfzz5gqdpn95pcypk5friab3svrambxv''; + name = ''domain_name-0.5.20''; + requiredGems = [ g.unf_0_1_4 ]; + sha256 = ''17ls88kp18dxjc93q8kmyx2anknva0vbmny60xbgpbwq3hg0qv6s''; }; - dotenv_0_9_0 = { + dotenv_0_11_1 = { basename = ''dotenv''; meta = { description = ''Loads environment variables from `.env`.''; homepage = ''https://github.com/bkeepers/dotenv''; longDescription = ''Loads environment variables from `.env`.''; }; - name = ''dotenv-0.9.0''; + 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''; requiredGems = [ ]; - sha256 = ''1gl0m6s8d6m72wcm4p86kzzjdihyryi5mh6v70qkqd0dl1gj73l3''; + sha256 = ''1ad66jq9a09qq1js8wsyil97018s7y6x0vzji0dy34gh65sbjz8c''; }; em_resolv_replace_1_1_3 = { basename = ''em_resolv_replace''; @@ -747,16 +555,16 @@ Suffix List. requiredGems = [ ]; sha256 = ''1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3''; }; - ethon_0_6_1 = { + ethon_0_7_1 = { basename = ''ethon''; meta = { description = ''Libcurl wrapper.''; homepage = ''https://github.com/typhoeus/ethon''; longDescription = ''Very lightweight libcurl wrapper.''; }; - name = ''ethon-0.6.1''; - requiredGems = [ g.ffi_1_9_0 g.mime_types_1_25 ]; - sha256 = ''05mw10bh4pif0j6pjzyhcsm8kzv7xn94dcjcb15dmbjx2za0daa7''; + name = ''ethon-0.7.1''; + requiredGems = [ g.ffi_1_9_3 ]; + sha256 = ''0b762cmnj20fjlrlzk5vsndzv4ac3ybdi4vikx5c11abl7x5wbg6''; }; eventmachine_1_0_3 = { basename = ''eventmachine''; @@ -789,91 +597,36 @@ using TCP/IP, especially if custom protocols are required.''; requiredGems = [ g.eventmachine_1_0_3 ]; sha256 = ''1pvlb34vdzd81kf9f3xyibb4f55xjqm7lqqy28dgyci5cyv50y61''; }; - excon_0_25_3 = { - basename = ''excon''; - meta = { - description = ''speed, persistence, http(s)''; - homepage = ''https://github.com/geemus/excon''; - longDescription = ''EXtended http(s) CONnections''; - }; - name = ''excon-0.25.3''; - requiredGems = [ ]; - sha256 = ''1d552jhvrpmnzrg3di88397l07ngrz04s2al17klpam6crxqw2b2''; - }; - execjs_2_0_2 = { - basename = ''execjs''; - meta = { - description = ''Run JavaScript code from Ruby''; - homepage = ''https://github.com/sstephenson/execjs''; - longDescription = ''ExecJS lets you run JavaScript code from Ruby.''; - }; - name = ''execjs-2.0.2''; - requiredGems = [ ]; - sha256 = ''167kbkyql7nvvwjsgdw5z8j66ngq7kc59gxfwsxhqi5fl1z0jbjs''; - }; - fakes3_0_1_5 = { + fakes3_0_1_5_2 = { basename = ''fakes3''; meta = { description = ''FakeS3 is a server that simulates S3 commands so you can test your S3 functionality in your projects''; longDescription = ''Use FakeS3 to test basic S3 functionality without actually connecting to S3''; }; - name = ''fakes3-0.1.5''; - requiredGems = [ g.thor_0_18_1 g.builder_3_2_2 ]; - sha256 = ''1na5wrbarla6s414svqmr5spbpv6vmcgpswal444x4clcpmadhib''; + name = ''fakes3-0.1.5.2''; + requiredGems = [ g.thor_0_19_1 g.builder_3_2_2 ]; + sha256 = ''1gmg428s1jpdwn7bd9pi4ikxg8440nq9yqs22wv0k355z5cqb8by''; }; - faraday_0_8_8 = { + faraday_0_9_0 = { basename = ''faraday''; meta = { description = ''HTTP/REST API client library.''; homepage = ''https://github.com/lostisland/faraday''; }; - name = ''faraday-0.8.8''; - requiredGems = [ g.multipart_post_1_2_0 ]; - sha256 = ''1cnyj5japrnv6wvl01la5amf7hikckfznh8234ad21n730b2wci4''; + name = ''faraday-0.9.0''; + requiredGems = [ g.multipart_post_2_0_0 ]; + sha256 = ''13wi8y7j6mp0mszps50gqr0fyddiz45wqkvpnnrv797gklr9sh46''; }; - faraday_middleware_0_8_8 = { + faraday_middleware_0_9_1 = { basename = ''faraday_middleware''; meta = { description = ''Various middleware for Faraday''; - homepage = ''https://github.com/pengwynn/faraday_middleware''; + homepage = ''https://github.com/lostisland/faraday_middleware''; longDescription = ''Various middleware for Faraday''; }; - name = ''faraday_middleware-0.8.8''; - requiredGems = [ g.faraday_0_8_8 ]; - sha256 = ''1n0g8pm7ynx6ffyqhscc1cqw97zhvd8isr31yfyj15335j1jsncz''; - }; - faraday_middleware_0_9_0 = { - basename = ''faraday_middleware''; - meta = { - description = ''Various middleware for Faraday''; - homepage = ''https://github.com/pengwynn/faraday_middleware''; - longDescription = ''Various middleware for Faraday''; - }; - name = ''faraday_middleware-0.9.0''; - requiredGems = [ g.faraday_0_8_8 ]; - sha256 = ''1kwvi2sdxd6j764a7q5iir73dw2v6816zx3l8cgfv0wr2m47icq2''; - }; - fast_stemmer_1_0_2 = { - basename = ''fast_stemmer''; - meta = { - description = ''Fast Porter stemmer based on a C version of algorithm''; - homepage = ''http://github.com/romanbsd/fast-stemmer''; - longDescription = ''Fast Porter stemmer based on a C version of algorithm''; - }; - name = ''fast-stemmer-1.0.2''; - requiredGems = [ ]; - sha256 = ''0688clyk4xxh3kdb18vi089k90mca8ji5fwaknh3da5wrzcrzanh''; - }; - ffi_1_9_0 = { - basename = ''ffi''; - meta = { - description = ''Ruby FFI''; - homepage = ''http://wiki.github.com/ffi/ffi''; - longDescription = ''Ruby FFI library''; - }; - name = ''ffi-1.9.0''; - requiredGems = [ ]; - sha256 = ''0rnh9yyfzcpdmi8m7giyd21lgqj00afgxvgbx41hsi2ls1ghfwvy''; + name = ''faraday_middleware-0.9.1''; + requiredGems = [ g.faraday_0_9_0 ]; + sha256 = ''1kndkrww1biz9j64fnyaqgis1gdiawxfv0ncadsz06gd555fgs6q''; }; ffi_1_9_3 = { basename = ''ffi''; @@ -894,32 +647,21 @@ using TCP/IP, especially if custom protocols are required.''; longDescription = ''Library to tail files in Ruby''; }; name = ''file-tail-1.0.12''; - requiredGems = [ g.tins_0_9_0 ]; + requiredGems = [ g.tins_0_13_2 ]; sha256 = ''0mzxxnwj7k5pwxs0rdbmb3b41zgvzw7x40sf3qlkch4zdfx91i1j''; }; - foreman_0_63_0 = { + foreman_0_74_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.63.0''; - requiredGems = [ g.thor_0_18_1 g.dotenv_0_9_0 ]; - sha256 = ''0yqyjix9jm4iwyc4f3wc32vxr28rpjcw1c9ni5brs4s2a24inzlk''; + name = ''foreman-0.74.0''; + requiredGems = [ g.thor_0_19_1 g.dotenv_0_11_1 ]; + sha256 = ''0jqblq0myzmdp2cywzz7flvgqnhf267ykcdn250cccy68s9wm37m''; }; - formatador_0_2_4 = { - basename = ''formatador''; - meta = { - description = ''Ruby STDOUT text formatting''; - homepage = ''http://github.com/geemus/formatador''; - longDescription = ''STDOUT text formatting''; - }; - name = ''formatador-0.2.4''; - requiredGems = [ ]; - sha256 = ''0pgmk1h6i6m3cslnfyjqld06a4c2xbbvmngxg2axddf39xwz6f12''; - }; - gettext_3_0_0 = { + gettext_3_1_3 = { basename = ''gettext''; meta = { description = ''Gettext is a pure Ruby libary and tools to localize messages.''; @@ -929,74 +671,33 @@ The catalog file(po-file) is same format with GNU gettext. So you can use GNU gettext tools for maintaining. ''; }; - name = ''gettext-3.0.0''; - requiredGems = [ g.locale_2_0_8 g.text_1_2_3 ]; - sha256 = ''1qlqd6c39bjn930qh93i40gbz1bs20gzpwvw3d8rxnkls5a6pl1y''; + name = ''gettext-3.1.3''; + requiredGems = [ g.locale_2_1_0 g.text_1_3_0 ]; + sha256 = ''066x2dbryab02kdbk6km79h4j9b0f0ynsnzcygjgvzn9001ybf9q''; }; - gh_0_12_0 = { + gh_0_13_2 = { basename = ''gh''; meta = { description = ''layered github client''; homepage = ''http://gh.rkh.im/''; longDescription = ''multi-layer client for the github api v3''; }; - name = ''gh-0.12.0''; - requiredGems = [ g.faraday_0_8_8 g.backports_3_3_3 g.multi_json_1_7_9 g.addressable_2_3_5 g.net_http_persistent_2_9 g.net_http_pipeline_1_0_1 ]; - sha256 = ''180jmg6rwilzcbzvyg74q27zpr09pv6pw3cfcjxr0bcklv203q3n''; + name = ''gh-0.13.2''; + requiredGems = [ g.faraday_0_9_0 g.backports_3_6_0 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_1 = { + gherkin_2_12_2 = { basename = ''gherkin''; meta = { - description = ''gherkin-2.12.1''; + description = ''gherkin-2.12.2''; homepage = ''http://github.com/cucumber/gherkin''; longDescription = ''A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.''; }; - name = ''gherkin-2.12.1''; - requiredGems = [ g.multi_json_1_7_9 ]; - sha256 = ''07nzchdvkkd35m9k7d9k8j72jm3imv56ccn734mxa5klv1xx2d45''; - }; - guard_2_2_4 = { - basename = ''guard''; - meta = { - description = ''Guard keeps an eye on your file modifications''; - homepage = ''http://guardgem.org''; - longDescription = ''Guard is a command line tool to easily handle events on file system modifications.''; - }; - name = ''guard-2.2.4''; - requiredGems = [ g.thor_0_18_1 g.listen_2_2_0 g.pry_0_9_12_3 g.lumberjack_1_0_4 g.formatador_0_2_4 ]; - sha256 = ''0z427rkcpzy82g21cgq7i5sn1vxn8hm8j4d78kj9vlaqgilcybhq''; - }; - highline_1_6_19 = { - basename = ''highline''; - meta = { - description = ''HighLine is a high-level command-line IO library.''; - homepage = ''http://highline.rubyforge.org''; - longDescription = ''A high-level IO library that provides validation, type conversion, and more for -command-line interfaces. HighLine also includes a complete menu system that can -crank out anything from simple list selection to complete shells with just -minutes of work. -''; - }; - name = ''highline-1.6.19''; - requiredGems = [ ]; - sha256 = ''0gylnz2cdaswgszgl8x2qx0c87md4246r1i0blgm3nqvgd4hlsxd''; - }; - highline_1_6_20 = { - basename = ''highline''; - meta = { - description = ''HighLine is a high-level command-line IO library.''; - homepage = ''http://highline.rubyforge.org''; - longDescription = ''A high-level IO library that provides validation, type conversion, and more for -command-line interfaces. HighLine also includes a complete menu system that can -crank out anything from simple list selection to complete shells with just -minutes of work. -''; - }; - name = ''highline-1.6.20''; - requiredGems = [ ]; - sha256 = ''0gk7mpw2r5lv60vr4hb0090wbnqh0fsbyrrcvxiqk7hyhxdz08iv''; + name = ''gherkin-2.12.2''; + requiredGems = [ g.multi_json_1_10_1 ]; + sha256 = ''1mxfgw15pii1jmq00xxbyp77v71mh3bp99ndgwzfwkxvbcisha25''; }; - highline_1_6_2 = { + highline_1_6_21 = { basename = ''highline''; meta = { description = ''HighLine is a high-level command-line IO library.''; @@ -1007,9 +708,9 @@ crank out anything from simple list selection to complete shells with just minutes of work. ''; }; - name = ''highline-1.6.2''; + name = ''highline-1.6.21''; requiredGems = [ ]; - sha256 = ''0azmahb70f1nlg6lq5wljbzcijhfb9lz8skwb4k2977kdml07mcn''; + sha256 = ''06bml1fjsnrhd956wqq5k3w8cyd09rv1vixdpa3zzkl6xs72jdn1''; }; hike_1_2_3 = { basename = ''hike''; @@ -1022,7 +723,7 @@ minutes of work. requiredGems = [ ]; sha256 = ''0i6c9hrszzg3gn2j41v3ijnwcm8cc2931fnjiv6mnpl4jcjjykhm''; }; - hoe_3_1_0 = { + hoe_3_7_1 = { basename = ''hoe''; meta = { description = ''Hoe is a rake/rubygems helper for project Rakefiles''; @@ -1038,108 +739,64 @@ below. For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; }; - name = ''hoe-3.1.0''; - requiredGems = [ g.rake_0_9_6 ]; - sha256 = ''0i961x0hrd6fs1nsfham87dhn64gqpnai27l14jag7qbnp3a79yp''; + name = ''hoe-3.7.1''; + requiredGems = [ g.rake_10_3_2 ]; + sha256 = ''0lyrdbzxj4isxzyfp93w0q1g9sqw6grkjp91xirzlw1z1714qsw3''; }; - http_cookie_1_0_1 = { + http_cookie_1_0_2 = { basename = ''http_cookie''; meta = { description = ''A Ruby library to handle HTTP Cookies based on RFC 6265''; homepage = ''https://github.com/sparklemotion/http-cookie''; 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.1''; - requiredGems = [ g.domain_name_0_5_13 ]; - sha256 = ''0gzghirmim217g7gf1rq3xiav8gfg32r38mcz0w9vznk30psy7d9''; + name = ''http-cookie-1.0.2''; + requiredGems = [ g.domain_name_0_5_20 ]; + sha256 = ''0cz2fdkngs3jc5w32a6xcl511hy03a7zdiy988jk1sf3bf5v3hdw''; }; - i18n_0_6_5 = { + i18n_0_6_11 = { basename = ''i18n''; meta = { description = ''New wave Internationalization support for Ruby''; homepage = ''http://github.com/svenfuchs/i18n''; longDescription = ''New wave Internationalization support for Ruby.''; }; - name = ''i18n-0.6.5''; + name = ''i18n-0.6.11''; requiredGems = [ ]; - sha256 = ''0cv15pi9f530fx9q3b83im7afy947dd86jf5ffqs9bvw8iykmil1''; + sha256 = ''0fwjlgmgry2blf8zlxn9c555cf4a16p287l599kz5104ncjxlzdk''; }; - iconv_1_0_3 = { + iconv_1_0_4 = { basename = ''iconv''; meta = { description = ''iconv wrapper library''; homepage = ''https://github.com/nurse/iconv''; longDescription = ''iconv wrapper library''; }; - name = ''iconv-1.0.3''; + name = ''iconv-1.0.4''; requiredGems = [ ]; - sha256 = ''1nhjn07h2fqivdj6xqzi2x2kzh28vigx8z3q5fv2cqn9aqmbdacl''; - }; - jekyll_1_3_0 = { - basename = ''jekyll''; - meta = { - description = ''A simple, blog aware, static site generator.''; - homepage = ''http://github.com/mojombo/jekyll''; - longDescription = ''Jekyll is a simple, blog aware, static site generator.''; - }; - name = ''jekyll-1.3.0''; - requiredGems = [ g.liquid_2_5_4 g.classifier_1_3_3 g.listen_1_3_1 g.maruku_0_6_1 g.pygments_rb_0_5_4 g.commander_4_1_5 g.safe_yaml_0_9_7 g.colorator_0_1 g.redcarpet_2_3_0 ]; - sha256 = ''0hq9sdyivfifba0d4d7g113jbd3jwm8jpdc9i09mv0nfhdcbc3k4''; - }; - jquery_rails_3_0_4 = { - basename = ''jquery_rails''; - meta = { - description = ''Use jQuery with Rails 3''; - homepage = ''http://rubygems.org/gems/jquery-rails''; - longDescription = ''This gem provides jQuery and the jQuery-ujs driver for your Rails 3 application.''; - }; - name = ''jquery-rails-3.0.4''; - requiredGems = [ g.railties_4_0_0 g.thor_0_18_1 ]; - sha256 = ''0k13mcl9d0zxa2azml0d06y14ggk5yl2xvzsc9l2qv2cwc9xxajm''; + sha256 = ''16sgj6gqs4bgwv6q4vv811fb43908psr33dz7sphn1z8la3y7m2v''; }; - jruby_pageant_1_1_1 = { - basename = ''jruby_pageant''; - meta = { - description = ''jruby-pageant allows Pageant access on JRuby + Windows''; - homepage = ''http://github.com/arturaz/jruby-pageant''; - longDescription = ''This is a convenience gem packaging required JNA/JSCH jars.''; - }; - name = ''jruby-pageant-1.1.1''; - requiredGems = [ ]; - sha256 = ''1kgqsn0bagr41gf5kbqaxbs38a7s5bm85m0pdx4qz7d70v9nc9cl''; - }; - jsduck_5_1_0 = { + jsduck_5_3_4 = { basename = ''jsduck''; meta = { description = ''Simple JavaScript Duckumentation generator''; homepage = ''https://github.com/senchalabs/jsduck''; longDescription = ''Documentation generator for Sencha JS frameworks''; }; - name = ''jsduck-5.1.0''; - requiredGems = [ g.rdiscount_2_1_6 g.json_1_8_0 g.parallel_0_7_1 g.rkelly_remix_0_0_4 g.dimensions_1_2_0 ]; - sha256 = ''05l2729524w6i1jywyb2kgbp8w04za8wbvx5w914f7mcsry98rn4''; + name = ''jsduck-5.3.4''; + requiredGems = [ g.rdiscount_2_1_7_1 g.json_1_8_1 g.parallel_0_7_1 g.rkelly_remix_0_0_6 g.dimensions_1_2_0 ]; + sha256 = ''0hac7g9g6gg10bigbm8dskwwbv1dfch8ca353gh2bkwf244qq2xr''; }; - json_1_8_0 = { + json_1_8_1 = { basename = ''json''; meta = { description = ''JSON Implementation for Ruby''; homepage = ''http://flori.github.com/json''; longDescription = ''This is a JSON implementation as a Ruby extension in C.''; }; - name = ''json-1.8.0''; + name = ''json-1.8.1''; requiredGems = [ ]; - sha256 = ''0a8prb853nwz9xqjhcd4rm9a5ng8arcn06hlacf0kcizzz69rr47''; - }; - json_pure_1_7_5 = { - basename = ''json_pure''; - meta = { - description = ''JSON Implementation for Ruby''; - homepage = ''http://flori.github.com/json''; - longDescription = ''This is a JSON implementation in pure Ruby.''; - }; - name = ''json_pure-1.7.5''; - requiredGems = [ ]; - sha256 = ''14nwwf001mh70qnynpb3h8c0kgcfi666yrg2frib4p6lr57jx8ap''; + sha256 = ''0002bsycvizvkmk1jyv8px1hskk6wrjfk4f7x5byi8gxm6zzn6wn''; }; json_pure_1_8_0 = { basename = ''json_pure''; @@ -1152,61 +809,18 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ ]; sha256 = ''0kkn5zhiffav2cffj43wwvzj07825r4j463ilfjgik034vnbjs83''; }; - launchy_2_3_0 = { + launchy_2_4_2 = { 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.3.0''; - requiredGems = [ g.addressable_2_3_5 ]; - sha256 = ''0ckvs40f29ancs0ki12pqb94k380cz41b4gbjplm85ly6kd57sph''; + name = ''launchy-2.4.2''; + requiredGems = [ g.addressable_2_3_6 ]; + sha256 = ''0i1nmlrqpnk2q6f7iq85cqaa7b8fw4bmqm57w60g92lsfmszs8iv''; }; - launchy_2_4_0 = { - 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.0''; - requiredGems = [ g.addressable_2_3_5 ]; - sha256 = ''0vxc3m4sjxyjjzw2rmsginf9nbxfyv7hhxshmn6kxkvcpjxx5di0''; - }; - liquid_2_5_4 = { - basename = ''liquid''; - meta = { - description = ''A secure, non-evaling end user template engine with aesthetic markup.''; - homepage = ''http://www.liquidmarkup.org''; - }; - name = ''liquid-2.5.4''; - requiredGems = [ ]; - sha256 = ''0adb1fz20jwcyx1ia133426i59mrrz9iq9lpcmzq6jx0dlaa4amv''; - }; - listen_1_3_1 = { - 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-1.3.1''; - requiredGems = [ g.rb_fsevent_0_9_3 g.rb_inotify_0_9_2 g.rb_kqueue_0_2_0 ]; - sha256 = ''1p1rqz26ixx0fzc0hy3psq2bb3pwkv9awixv76zkaaqj1czabzbs''; - }; - listen_2_2_0 = { - 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.2.0''; - requiredGems = [ g.celluloid_0_15_2 g.rb_fsevent_0_9_3 g.rb_inotify_0_9_2 ]; - sha256 = ''1fm6cp5d4xbd5wdd0d804m3p2cc5rjrr5yzqzzh1ndzgbs94sv5c''; - }; - locale_2_0_8 = { + locale_2_1_0 = { basename = ''locale''; meta = { description = ''Ruby-Locale is the pure ruby library which provides basic APIs for localization.''; @@ -1214,42 +828,31 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; longDescription = ''Ruby-Locale is the pure ruby library which provides basic APIs for localization. ''; }; - name = ''locale-2.0.8''; + name = ''locale-2.1.0''; requiredGems = [ ]; - sha256 = ''1hmixxg4aigl3h1qmz4fdsrv81p0bblcjbks32nrcvcpwmlylf12''; + sha256 = ''18bb0g24flq9dr8qv4j7pm7w9i2vmvmqrbmry95ibf1r1c4s60yj''; }; - lockfile_2_1_0 = { + lockfile_2_1_3 = { basename = ''lockfile''; meta = { description = ''lockfile''; homepage = ''https://github.com/ahoward/lockfile''; - longDescription = ''description: lockfile kicks the ass''; + longDescription = ''a ruby library for creating perfect and NFS safe lockfiles''; }; - name = ''lockfile-2.1.0''; + name = ''lockfile-2.1.3''; requiredGems = [ ]; - sha256 = ''1yfpz9k0crb7q7y5bcaavf2jzbc170dj84hqz13qp75rj7bl3qhf''; + sha256 = ''0dij3ijywylvfgrpi2i0k17f6w0wjhnjjw0k9030f54z56cz7jrr''; }; - lumberjack_1_0_4 = { - basename = ''lumberjack''; - meta = { - description = ''A simple, powerful, and very fast logging utility that can be a drop in replacement for Logger or ActiveSupport::BufferedLogger.''; - homepage = ''http://github.com/bdurand/lumberjack''; - longDescription = ''A simple, powerful, and very fast logging utility that can be a drop in replacement for Logger or ActiveSupport::BufferedLogger. Provides support for automatically rolling log files even with multiple processes writing the same log file.''; - }; - name = ''lumberjack-1.0.4''; - requiredGems = [ ]; - sha256 = ''1mj6m12hnmkvzl4w2yh04ak3z45pwksj6ra7v30za8snw9kg919d''; - }; - macaddr_1_6_1 = { + macaddr_1_7_1 = { basename = ''macaddr''; meta = { description = ''macaddr''; homepage = ''https://github.com/ahoward/macaddr''; - longDescription = ''description: macaddr kicks the ass''; + longDescription = ''cross platform mac address determination for ruby''; }; - name = ''macaddr-1.6.1''; - requiredGems = [ g.systemu_2_5_2 ]; - sha256 = ''1vd9l1d0lc0sq3rn1ya816wrzgxxqdzq6pgq0y0435qm6ikwy7ch''; + name = ''macaddr-1.7.1''; + requiredGems = [ g.systemu_2_6_4 ]; + sha256 = ''1clii8mvhmh5lmnm95ljnjygyiyhdpja85c5vy487rhxn52scn0b''; }; mail_2_5_4 = { basename = ''mail''; @@ -1259,24 +862,21 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; longDescription = ''A really Ruby Mail handler.''; }; name = ''mail-2.5.4''; - requiredGems = [ g.mime_types_1_25 g.treetop_1_4_15 ]; + requiredGems = [ g.mime_types_1_25_1 g.treetop_1_4_15 ]; sha256 = ''0z15ksb8blcppchv03g34844f7xgf36ckp484qjj2886ig1qara4''; }; - maruku_0_6_1 = { - basename = ''maruku''; + mail_2_6_1 = { + basename = ''mail''; meta = { - description = ''Maruku is a Markdown-superset interpreter written in Ruby.''; - homepage = ''http://github.com/bhollis/maruku''; - longDescription = ''Maruku is a Markdown interpreter in Ruby. - It features native export to HTML and PDF (via Latex). The - output is really beautiful! - ''; + description = ''Mail provides a nice Ruby DSL for making, sending and reading emails.''; + homepage = ''http://github.com/mikel/mail''; + longDescription = ''A really Ruby Mail handler.''; }; - name = ''maruku-0.6.1''; - requiredGems = [ g.syntax_1_0_0 ]; - sha256 = ''01xc4l480k79jbicr0j37d9bmd4dsnrjh5hwdrh2djvy06l77ngz''; + name = ''mail-2.6.1''; + requiredGems = [ g.mime_types_2_3 ]; + sha256 = ''17gsw57nc7ihk4xnbq9lidzv6h1ivh4l5m16hy790vs219n22mhx''; }; - mechanize_2_7_2 = { + mechanize_2_7_3 = { basename = ''mechanize''; meta = { description = ''The Mechanize library is used for automating interaction with websites''; @@ -1287,9 +887,9 @@ and can follow links and submit forms. Form fields can be populated and submitted. Mechanize also keeps track of the sites that you have visited as a history.''; }; - name = ''mechanize-2.7.2''; - requiredGems = [ g.net_http_digest_auth_1_4 g.net_http_persistent_2_9 g.mime_types_1_25 g.http_cookie_1_0_1 g.nokogiri_1_6_0 g.ntlm_http_0_1_1 g.webrobots_0_1_1 g.domain_name_0_5_13 ]; - sha256 = ''1w1rnn6jps1393gywi38saw5iqrvyai3vmvbv2kbc9j0zj5csyrl''; + 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_20 ]; + sha256 = ''00jkazj8fqnynaxca0lnwx5a084irxrnw8n8i0kppq4vg71g7rrx''; }; method_source_0_8_2 = { basename = ''method_source''; @@ -1302,20 +902,22 @@ a history.''; requiredGems = [ ]; sha256 = ''1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2''; }; - mime_types_1_25 = { + mime_types_1_25_1 = { basename = ''mime_types''; meta = { description = ''This library allows for the identification of a file's likely MIME content type''; homepage = ''http://mime-types.rubyforge.org/''; longDescription = ''This library allows for the identification of a file's likely MIME content -type. This is release 1.25, adding experimental caching and lazy loading -functionality. +type. This is release 1.25.1, fixing an issue with priority comparison for +mime-types 1.x. The current release is 2.0, which only supports Ruby 1.9 or +later. -The caching and lazy loading features were initially implemented by Greg -Brockman (gdb). As these features are experimental, they are disabled by -default and must be enabled through the use of environment variables. The cache -is invalidated on a per-version basis; the cache for version 1.25 will not be -reused for version 1.26. +Release 1.25.1 contains all features of 1.25, including the experimental +caching and lazy loading functionality. The caching and lazy loading features +were initially implemented by Greg Brockman (gdb). As these features are +experimental, they are disabled by default and must be enabled through the use +of environment variables. The cache is invalidated on a per-version basis; the +cache for version 1.25 will not be reused for any later version. To use lazy loading, set the environment variable +RUBY_MIME_TYPES_LAZY_LOAD+ to any value other than 'false'. When using lazy loading, the initial startup @@ -1346,8 +948,7 @@ complete; don't hesitate to ask to add additional information. This library follows the IANA collection of MIME types (see below for reference). MIME::Types for Ruby was originally based on MIME::Types for Perl by Mark -Overmeer, copyright 2001 - 2009. As of version 1.15, the data format for the -MIME::Type list has changed and the synchronization will no longer happen. +Overmeer, copyright 2001 - 2009. MIME::Types is built to conform to the MIME types of RFCs 2045 and 2231. It tracks the {IANA registry}[http://www.iana.org/assignments/media-types/] @@ -1355,15 +956,15 @@ tracks the {IANA registry}[http://www.iana.org/assignments/media-types/] added from the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp] and added by the users of MIME::Types.''; }; - name = ''mime-types-1.25''; + name = ''mime-types-1.25.1''; requiredGems = [ ]; - sha256 = ''0hd6hpl05jyx3siznk70z46bmrzwmcyrr24yfaqg6nar35zw8bgf''; + sha256 = ''0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8''; }; - mime_types_2_0 = { + mime_types_2_3 = { basename = ''mime_types''; meta = { description = ''The mime-types library provides a library and registry for information about MIME content type definitions''; - homepage = ''http://mime-types.rubyforge.org/''; + homepage = ''https://github.com/halostatue/mime-types/''; longDescription = ''The mime-types library provides a library and registry for information about MIME content type definitions. It can be used to determine defined filename extensions for MIME types, or to use filename extensions to look up the likely @@ -1379,46 +980,50 @@ 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. -The mime-types library uses semantic versioning. This is release 2.0; there are -incompatible changes in the API provided by mime-types, mostly around registry -initialization (see History.rdoc for full details), and the removal of support -for Ruby 1.8 interpreters. +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. + +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 +or features will be added. mime-types (previously called MIME::Types for Ruby) was originally based on MIME::Types for Perl by Mark Overmeer, copyright 2001 - 2009. It is built to -conform to the MIME types of RFCs 2045 and 2231. It tracks the {IANA -registry}[http://www.iana.org/assignments/media-types/] -({ftp}[ftp://ftp.iana.org/assignments/media-types]) with some unofficial types -added from the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp] -and added by the users of mime-types.''; +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.0''; + name = ''mime-types-2.3''; requiredGems = [ ]; - sha256 = ''1q1s22l3mm0am2f7n9qjqp8zl0smr9zlqr2ywwyfjkid2sj3prfk''; + sha256 = ''0j0mwzr2q9fmisp3r8rp7j95dns2gw7sd8c5sb5y6z0dfj56a4vd''; }; - mini_portile_0_5_1 = { + mini_portile_0_6_0 = { 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.5.1''; + name = ''mini_portile-0.6.0''; requiredGems = [ ]; - sha256 = ''0cafnlhdzakzl5vqcm9b97kchj9bvhlcf4ylkyr85lz1263hbagg''; + sha256 = ''09kcn4g63xrdirgwxgjikqg976rr723bkc9bxfr29pk22cj3wavn''; }; - minitar_0_5_3 = { + minitar_0_5_4 = { basename = ''minitar''; meta = { description = ''Provides POSIX tarchive management from Ruby programs.''; - homepage = ''http://rubyforge.org/projects/ruwiki/''; - longDescription = ''Archive::Tar::Minitar is a pure-Ruby library and command-line utility that provides the ability to deal with POSIX tar(1) archive files. The implementation is based heavily on Mauricio Ferna'ndez's implementation in rpa-base, but has been reorganised to promote reuse in other projects.''; + homepage = ''http://www.github.com/atoulme/minitar''; + longDescription = ''Archive::Tar::Minitar is a pure-Ruby library and command-line utility that provides the ability to deal with POSIX tar(1) archive files. The implementation is based heavily on Mauricio Ferna'ndez's implementation in rpa-base, but has been reorganised to promote reuse in other projects. Antoine Toulme forked the original project on rubyforge to place it on github, under http://www.github.com/atoulme/minitar''; }; - name = ''minitar-0.5.3''; + name = ''minitar-0.5.4''; requiredGems = [ ]; - sha256 = ''035vs1knnnjsb8arfp8vx75warvwcdpiljjwv38lqljai9v8fq53''; + sha256 = ''1vpdjfmdq1yc4i620frfp9af02ia435dnpj8ybsd7dc3rypkvbka''; }; - minitest_4_7_5 = { + minitest_5_4_0 = { basename = ''minitest''; meta = { description = ''minitest provides a complete suite of testing facilities supporting TDD, BDD, mocking, and benchmarking''; @@ -1477,64 +1082,53 @@ 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-4.7.5''; - requiredGems = [ ]; - sha256 = ''03p6iban9gcpcflzp4z901s1hgj9369p6515h967ny6hlqhcf2iy''; - }; - mono_logger_1_1_0 = { - basename = ''mono_logger''; - meta = { - description = ''A lock-free logger compatible with Ruby 2.0.''; - homepage = ''http://github.com/steveklabnik/mono_logger''; - longDescription = ''A lock-free logger compatible with Ruby 2.0. Ruby does not allow you to request a lock in a trap handler because that could deadlock, so Logger is not sufficient.''; - }; - name = ''mono_logger-1.1.0''; + name = ''minitest-5.4.0''; requiredGems = [ ]; - sha256 = ''18yplq3xxv5crwpfwbw2sb6brqd3g51si7x9fbh9bcimg4ipzayp''; + sha256 = ''002xflqz5wl8gcj9gw4q66mq5jkp445zgd9c5vs6cw6lsfsyg4rl''; }; - multi_json_1_7_9 = { + multi_json_1_10_1 = { basename = ''multi_json''; meta = { description = ''A common interface to multiple JSON libraries.''; homepage = ''http://github.com/intridea/multi_json''; longDescription = ''A common interface to multiple JSON libraries, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, NSJSONSerialization, gson.rb, JrJackson, and OkJson.''; }; - name = ''multi_json-1.7.9''; + name = ''multi_json-1.10.1''; requiredGems = [ ]; - sha256 = ''1q13ldcc8shlfisy90k19zrar87208gs3za6jmr78p11ip21picx''; + sha256 = ''1ll21dz01jjiplr846n1c8yzb45kj5hcixgb72rz0zg8fyc9g61c''; }; - multi_json_1_8_2 = { + multi_json_1_3_6 = { basename = ''multi_json''; meta = { - description = ''A common interface to multiple JSON libraries.''; + description = ''A gem to provide swappable JSON backends.''; homepage = ''http://github.com/intridea/multi_json''; - longDescription = ''A common interface to multiple JSON libraries, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, NSJSONSerialization, gson.rb, JrJackson, and OkJson.''; + longDescription = ''A gem to provide easy switching between different JSON backends, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, and OkJson.''; }; - name = ''multi_json-1.8.2''; + name = ''multi_json-1.3.6''; requiredGems = [ ]; - sha256 = ''1ffmnwsfwdgspk86x1g98cq2ivqlgqpqngyrvs07zsnvgdimahdb''; + sha256 = ''0q2zjfvd2ibds9g9nzf2p1b47fc1wqliwfywv5pw85w15lmy91yr''; }; - multi_test_0_0_2 = { + multi_test_0_1_1 = { basename = ''multi_test''; meta = { - description = ''multi-test-0.0.2''; + description = ''multi-test-0.1.1''; homepage = ''http://cukes.info''; longDescription = ''Wafter-thin gem to help control rogue test/unit/autorun requires''; }; - name = ''multi_test-0.0.2''; + name = ''multi_test-0.1.1''; requiredGems = [ ]; - sha256 = ''0y8i0v0awc87laicqz1348k54z6wsyf141xqd7gh2bjgm9pc9pkr''; + sha256 = ''1dd810limbdc8k7ss83g83krrsjjqs79nicbdxk74l1a2sp2jhwv''; }; - multipart_post_1_2_0 = { + multipart_post_2_0_0 = { basename = ''multipart_post''; meta = { description = ''A multipart form post accessory for Net::HTTP.''; homepage = ''https://github.com/nicksieger/multipart-post''; longDescription = ''Use with Net::HTTP to do multipart form posts. IO values that have #content_type, #original_filename, and #local_path will be posted as a binary file.''; }; - name = ''multipart-post-1.2.0''; + name = ''multipart-post-2.0.0''; requiredGems = [ ]; - sha256 = ''12p7lnmc52di1r4h73h6xrpppplzyyhani9p7wm8l4kgf1hnmwnc''; + sha256 = ''09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x''; }; net_http_digest_auth_1_4 = { basename = ''net_http_digest_auth''; @@ -1553,7 +1147,7 @@ for an example.''; requiredGems = [ ]; sha256 = ''14801gr34g0rmqz9pv4rkfa3crfdbyfk6r48vpg5a5407v0sixqi''; }; - net_http_persistent_2_9 = { + net_http_persistent_2_9_4 = { basename = ''net_http_persistent''; meta = { description = ''Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8''; @@ -1569,9 +1163,9 @@ Net::HTTP supports persistent connections with some API methods but does not handle reconnection gracefully. Net::HTTP::Persistent supports reconnection and retry according to RFC 2616.''; }; - name = ''net-http-persistent-2.9''; + name = ''net-http-persistent-2.9.4''; requiredGems = [ ]; - sha256 = ''0k9bp7q5fsh908jnkwfj71ky04i4ih0ky6sqi5vl6zcpjsczgfcb''; + sha256 = ''1y9fhaax0d9kkslyiqi1zys6cvpaqx9a0y0cywp24rpygwh4s9r4''; }; net_http_pipeline_1_0_1 = { basename = ''net_http_pipeline''; @@ -1586,49 +1180,38 @@ The server will respond in-order.''; requiredGems = [ ]; sha256 = ''0bxjy33yhxwsbnld8xj3zv64ibgfjn9rjpiqkyd5ipmz50pww8v9''; }; - net_sftp_2_0_5 = { + net_sftp_2_1_2 = { basename = ''net_sftp''; meta = { description = ''A pure Ruby implementation of the SFTP client protocol''; - homepage = ''http://net-ssh.rubyforge.org/sftp''; + homepage = ''https://github.com/net-ssh/net-sftp''; longDescription = ''A pure Ruby implementation of the SFTP client protocol''; }; - name = ''net-sftp-2.0.5''; - requiredGems = [ g.net_ssh_2_6_8 ]; - sha256 = ''0lqk735wspm8rbiyxpbil8ikrqcyg00ss1df7fny0761c3as6m0v''; + name = ''net-sftp-2.1.2''; + requiredGems = [ g.net_ssh_2_9_1 ]; + sha256 = ''04674g4n6mryjajlcd82af8g8k95la4b1bj712dh71hw1c9vhw1y''; }; - net_ssh_2_6_0 = { + net_ssh_2_7_0 = { basename = ''net_ssh''; meta = { description = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.''; - homepage = ''http://github.com/net-ssh/net-ssh''; + homepage = ''https://github.com/net-ssh/net-ssh''; longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol. It allows you to write programs that invoke and interact with processes on remote servers, via SSH2.''; }; - name = ''net-ssh-2.6.0''; - requiredGems = [ g.jruby_pageant_1_1_1 ]; - sha256 = ''18fsgps4a9dfrjszkl3py8j7vw0xwi70bcp59ccj2rlr6i1jv5gw''; + name = ''net-ssh-2.7.0''; + requiredGems = [ ]; + sha256 = ''14v0cq2fws54kxpgz249xmjlajynhcs4s2szl8kjxgn4c78lrkmr''; }; - net_ssh_2_6_8 = { + net_ssh_2_9_1 = { basename = ''net_ssh''; meta = { description = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.''; homepage = ''https://github.com/net-ssh/net-ssh''; longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol. It allows you to write programs that invoke and interact with processes on remote servers, via SSH2.''; }; - name = ''net-ssh-2.6.8''; + name = ''net-ssh-2.9.1''; requiredGems = [ ]; - sha256 = ''0vf9w8b9f5ha94nwhvwxyqk4lfpy42ihl1g0qib8dfvswlkqw3mx''; - }; - netrc_0_7_7 = { - 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''; - requiredGems = [ ]; - sha256 = ''1y64v93hsxdwgx3dfkyzdki3zqd1slm42dmi23v0zy3kap4vpard''; + sha256 = ''1vscp4r58jisiigqc6d6752w19m1m6hmi3jkzmp3ydxai7h3jb2j''; }; nix_0_1_1 = { basename = ''nix''; @@ -1641,22 +1224,7 @@ The server will respond in-order.''; requiredGems = [ ]; sha256 = ''0kwrbkkg0gxibhsz9dpd5zabcf2wqsicg28yiazyb3dc9dslk26k''; }; - nokogiri_1_5_10 = { - basename = ''nokogiri''; - meta = { - description = ''Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser''; - homepage = ''http://nokogiri.org''; - longDescription = ''Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser. Among Nokogiri's -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.5.10''; - requiredGems = [ ]; - sha256 = ''0dblphzwzl705xmlqcflz8s60xzbcgi4xqzx7984l4kcssbkn71b''; - }; - nokogiri_1_6_0 = { + nokogiri_1_6_3_1 = { basename = ''nokogiri''; meta = { description = ''Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser''; @@ -1667,9 +1235,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.0''; - requiredGems = [ g.mini_portile_0_5_1 ]; - sha256 = ''1icrny9w2hd0pm7cyq5wqdkbzr57dkma1lbyrr0x14lsnangkidb''; + name = ''nokogiri-1.6.3.1''; + requiredGems = [ g.mini_portile_0_6_0 ]; + sha256 = ''11958hlfd8i3i9y0wk1b6ck9x0j95l4zdbbixmdnnh1r8ijilxli''; }; ntlm_http_0_1_1 = { basename = ''ntlm_http''; @@ -1682,16 +1250,26 @@ enough of it.''; requiredGems = [ ]; sha256 = ''0yx01ffrw87wya1syivqzf8hz02axk7jdpw6aw221xwvib767d36''; }; - papertrail_0_9_7 = { + orderedhash_0_0_6 = { + basename = ''orderedhash''; + meta = { + description = ''orderedhash''; + homepage = ''http://codeforpeople.com/lib/ruby/orderedhash/''; + }; + name = ''orderedhash-0.0.6''; + requiredGems = [ ]; + sha256 = ''0fryy7f9jbpx33jq5m402yqj01zcg563k9fsxlqbhmq638p4bzd7''; + }; + papertrail_0_9_10 = { 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.7''; - requiredGems = [ g.addressable_2_3_5 g.yajl_ruby_1_1_0 g.chronic_0_10_1 g.faraday_0_8_8 g.faraday_middleware_0_8_8 ]; - sha256 = ''0v0m1v0qabbr9pmyl77znz39qy1m7p0xwvf3lf9hyq6n524f2dwr''; + name = ''papertrail-0.9.10''; + requiredGems = [ g.chronic_0_10_2 ]; + sha256 = ''1v2acc896w5q72m5pfxc8rx36gzih4fivyiqp0kxwypgyh0f0x58''; }; papertrail_cli_0_9_3 = { basename = ''papertrail_cli''; @@ -1701,7 +1279,7 @@ enough of it.''; longDescription = ''Placeholder gem to point to new papertrail gem.''; }; name = ''papertrail-cli-0.9.3''; - requiredGems = [ g.papertrail_0_9_7 ]; + requiredGems = [ g.papertrail_0_9_10 ]; sha256 = ''1914dcfqsmw5rl4xd1zwjrfbgwglyncxm8km06bgxaqn4wnaq5iv''; }; parallel_0_7_1 = { @@ -1714,7 +1292,7 @@ enough of it.''; requiredGems = [ ]; sha256 = ''1kzz6ydg7r23ks2b7zbpx4vz3h186n19vhgnjcwi7xwd6h2f1fsq''; }; - polyglot_0_3_3 = { + polyglot_0_3_5 = { basename = ''polyglot''; meta = { description = ''Augment 'require' to load non-Ruby file types''; @@ -1724,64 +1302,31 @@ The Polyglot library allows a Ruby module to register a loader for the file type associated with a filename extension, and it augments 'require' to find and load matching files.''; }; - name = ''polyglot-0.3.3''; + name = ''polyglot-0.3.5''; requiredGems = [ ]; - sha256 = ''082zmail2h3cxd9z1wnibhk6aj4sb1f3zzwra6kg9bp51kx2c00v''; + sha256 = ''1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr''; }; - posix_spawn_0_3_6 = { - basename = ''posix_spawn''; - meta = { - description = ''posix_spawnp(2) for ruby''; - homepage = ''http://github.com/rtomayko/posix-spawn''; - longDescription = ''posix-spawn uses posix_spawnp(2) for faster process spawning''; - }; - name = ''posix-spawn-0.3.6''; - requiredGems = [ ]; - sha256 = ''0f2mqka8024yz55iw8wbihvmakwqnbrdr4a1ffl3x2zi104yvb43''; - }; - pry_0_9_12_2 = { + pry_0_9_12_6 = { basename = ''pry''; meta = { description = ''An IRB alternative and runtime developer console''; homepage = ''http://pry.github.com''; longDescription = ''An IRB alternative and runtime developer console''; }; - name = ''pry-0.9.12.2''; - requiredGems = [ g.coderay_1_0_9 g.slop_3_4_6 g.method_source_0_8_2 ]; - sha256 = ''141slzb62zfzdhrygqjmrzh68s3vzrb4mwyipy2lhps5q4b46y9s''; + name = ''pry-0.9.12.6''; + requiredGems = [ g.coderay_1_1_0 g.slop_3_6_0 g.method_source_0_8_2 ]; + sha256 = ''0wmgamn83m1zb1fbqc22hiszjf2a2xij5jd95w2gvm5x6l5p61q1''; }; - pry_0_9_12_3 = { - basename = ''pry''; - meta = { - description = ''An IRB alternative and runtime developer console''; - homepage = ''http://pry.github.com''; - longDescription = ''An IRB alternative and runtime developer console''; - }; - name = ''pry-0.9.12.3''; - requiredGems = [ g.coderay_1_1_0 g.slop_3_4_7 g.method_source_0_8_2 ]; - sha256 = ''1dn80vnyq1l6192sg3p29d0yz6rswnsl8rn3lkf75c86a2qqxpy3''; - }; - pusher_client_0_3_1 = { + pusher_client_0_6_0 = { basename = ''pusher_client''; meta = { description = ''Client for consuming WebSockets from http://pusher.com''; homepage = ''http://github.com/pusher/pusher-ruby-client''; longDescription = ''Client for consuming WebSockets from http://pusher.com''; }; - name = ''pusher-client-0.3.1''; - requiredGems = [ g.websocket_1_0_7 g.ruby_hmac_0_4_0 ]; - sha256 = ''1mxqy960iln065fypk1ww3xgv7q396fpl6v0rp7ipls6aj86j970''; - }; - pygments_rb_0_5_4 = { - basename = ''pygments_rb''; - meta = { - description = ''pygments wrapper for ruby''; - homepage = ''http://github.com/tmm1/pygments.rb''; - longDescription = ''pygments.rb exposes the pygments syntax highlighter to Ruby''; - }; - name = ''pygments.rb-0.5.4''; - requiredGems = [ g.yajl_ruby_1_1_0 g.posix_spawn_0_3_6 ]; - sha256 = ''0ryl0f0zp0rffaggd978cmrkzsmf83x452fcinw6p705xdk4zbvl''; + name = ''pusher-client-0.6.0''; + requiredGems = [ g.websocket_1_2_0 g.json_1_8_1 ]; + sha256 = ''0n7l630qg6wgzak45b6gfjg9a0fmpbrs7mwchqqbja9mjs95r8qy''; }; rack_1_5_2 = { basename = ''rack''; @@ -1801,27 +1346,16 @@ Also see http://rack.github.com/. requiredGems = [ ]; sha256 = ''19szfw76cscrzjldvw30jp3461zl00w4xvw1x9lsmyp86h1g0jp6''; }; - rack_protection_1_5_0 = { - basename = ''rack_protection''; - meta = { - description = ''You should use protection!''; - homepage = ''http://github.com/rkh/rack-protection''; - longDescription = ''You should use protection!''; - }; - name = ''rack-protection-1.5.0''; - requiredGems = [ g.rack_1_5_2 ]; - sha256 = ''10wm67f2mp9pryg0s8qapbyxd2lcrpb8ywsbicg29cv2xprhbl4j''; - }; - rack_protection_1_5_1 = { + rack_protection_1_5_3 = { basename = ''rack_protection''; meta = { description = ''You should use protection!''; homepage = ''http://github.com/rkh/rack-protection''; longDescription = ''You should use protection!''; }; - name = ''rack-protection-1.5.1''; + name = ''rack-protection-1.5.3''; requiredGems = [ g.rack_1_5_2 ]; - sha256 = ''0qxq5ld15nljxzdcx2wmbc3chw8nb6la1ap838vf263lnjcpx3dd''; + sha256 = ''0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r''; }; rack_test_0_6_2 = { basename = ''rack_test''; @@ -1837,27 +1371,27 @@ request helpers feature.''; requiredGems = [ g.rack_1_5_2 ]; sha256 = ''01mk715ab5qnqf6va8k3hjsvsmplrfqpz6g58qw4m3l8mim0p4ky''; }; - rails_4_0_0 = { + rails_4_1_5 = { 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.0.0''; - requiredGems = [ g.activesupport_4_0_0 g.actionpack_4_0_0 g.activerecord_4_0_0 g.actionmailer_4_0_0 g.railties_4_0_0 g.bundler_1_3_5 g.sprockets_rails_2_0_0 ]; - sha256 = ''12q2z2zpqpr61rqdx8can2ay6y1xxi6ghmlkyvfvxnnwwzxypavf''; + name = ''rails-4.1.5''; + requiredGems = [ g.activesupport_4_1_5 g.actionpack_4_1_5 g.actionview_4_1_5 g.activemodel_4_1_5 g.activerecord_4_1_5 g.actionmailer_4_1_5 g.railties_4_1_5 g.bundler_1_7_1 g.sprockets_rails_2_1_3 ]; + sha256 = ''12s3jkvd6bn40apxc3973czgs7s6y36aclbwif6j770v7sjd9qj7''; }; - railties_4_0_0 = { + railties_4_1_5 = { 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.0.0''; - requiredGems = [ g.activesupport_4_0_0 g.actionpack_4_0_0 g.rake_10_1_0 g.thor_0_18_1 ]; - sha256 = ''063yyp75b87z0nr1mayzyq462nnhfm834mn97fcyg2mf3zr8qbly''; + name = ''railties-4.1.5''; + requiredGems = [ g.activesupport_4_1_5 g.actionpack_4_1_5 g.rake_10_3_2 g.thor_0_19_1 ]; + sha256 = ''18jkjvny51vk53l2g9ibcnjk3gjj1vgh3pyrskmk69csqm2hmaha''; }; rake_0_9_2_2 = { basename = ''rake''; @@ -1870,109 +1404,58 @@ request helpers feature.''; requiredGems = [ ]; sha256 = ''19n4qp5gzbcqy9ajh56kgwqv9p9w2hnczhyvaqz0nlvk9diyng6q''; }; - rake_0_9_6 = { - basename = ''rake''; - meta = { - description = ''Ruby based make-like utility.''; - homepage = ''http://rake.rubyforge.org''; - longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies arespecified in standard Ruby syntax.''; - }; - name = ''rake-0.9.6''; - requiredGems = [ ]; - sha256 = ''09kyh351gddn6gjz255hbaza1cw235xvfz9dc15rhyq9phvqdphc''; - }; - rake_10_1_0 = { + rake_10_3_2 = { basename = ''rake''; meta = { - description = ''Ruby based make-like utility.''; - homepage = ''http://rake.rubyforge.org''; - longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies arespecified in standard Ruby syntax.''; + description = ''Rake is a Make-like program implemented in Ruby''; + homepage = ''https://github.com/jimweirich/rake''; + longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies are +specified in standard Ruby syntax. + +Rake has the following features: + +* Rakefiles (rake's version of Makefiles) are completely defined in + standard Ruby syntax. No XML files to edit. No quirky Makefile + syntax to worry about (is that a tab or a space?) + +* Users can specify tasks with prerequisites. + +* Rake supports rule patterns to synthesize implicit tasks. + +* Flexible FileLists that act like arrays but know about manipulating + file names and paths. + +* A library of prepackaged tasks to make building rakefiles easier. For example, + tasks for building tarballs and publishing to FTP or SSH sites. (Formerly + tasks for building RDoc and Gems were included in rake but they're now + available in RDoc and RubyGems respectively.) + +* Supports parallel execution of tasks.''; }; - name = ''rake-10.1.0''; + name = ''rake-10.3.2''; requiredGems = [ ]; - sha256 = ''1frsqpihi39x3yqaa7m9vbls1kd24wckbj5cpiwqix8xmcwnic7q''; + sha256 = ''0nvpkjrpsk8xxnij2wd1cdn6arja9q11sxx4aq4fz18bc6fss15m''; }; - rb_fsevent_0_9_3 = { + rb_fsevent_0_9_4 = { basename = ''rb_fsevent''; meta = { description = ''Very simple & usable FSEvents API''; homepage = ''http://rubygems.org/gems/rb-fsevent''; longDescription = ''FSEvents API with Signals catching (without RubyCocoa)''; }; - name = ''rb-fsevent-0.9.3''; + name = ''rb-fsevent-0.9.4''; requiredGems = [ ]; - sha256 = ''0bdnxwdxj4r1kdxfi5nszbsb126njrr81p912g64xxs2bgxd1bp1''; + sha256 = ''12if5xsik64kihxf5awsyavlp595y47g9qz77vfp2zvkxgglaka7''; }; - rb_inotify_0_9_2 = { - basename = ''rb_inotify''; - meta = { - description = ''A Ruby wrapper for Linux's inotify, using FFI''; - homepage = ''http://github.com/nex3/rb-inotify''; - longDescription = ''A Ruby wrapper for Linux's inotify, using FFI''; - }; - name = ''rb-inotify-0.9.2''; - requiredGems = [ g.ffi_1_9_3 ]; - sha256 = ''0752fhgfrx370b2jnhxzs8sjv2l8yrnwqj337kx9v100igd1c7iv''; - }; - rb_kqueue_0_2_0 = { - basename = ''rb_kqueue''; - meta = { - description = ''A Ruby wrapper for BSD's kqueue, using FFI''; - homepage = ''http://github.com/mat813/rb-kqueue''; - longDescription = ''A Ruby wrapper for BSD's kqueue, using FFI''; - }; - name = ''rb-kqueue-0.2.0''; - requiredGems = [ g.ffi_1_9_3 ]; - sha256 = ''1f2wimhq93a1zy2fbyj7iyh7hvzmzwn3pzhkwb3npy4mj1df83n3''; - }; - rdiscount_2_1_6 = { + rdiscount_2_1_7_1 = { basename = ''rdiscount''; meta = { description = ''Fast Implementation of Gruber's Markdown in C''; homepage = ''http://dafoster.net/projects/rdiscount/''; }; - name = ''rdiscount-2.1.6''; + name = ''rdiscount-2.1.7.1''; requiredGems = [ ]; - sha256 = ''180ln9gwxn0cyflg0i1viv7jyalmjqvqr34cb65xsmmsz1nz55q2''; - }; - redcarpet_2_3_0 = { - 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-2.3.0''; - requiredGems = [ ]; - sha256 = ''1fghh7n9kz6n6bdhgix5s8lyj5sw6q44zizf4mdgz5xsgwqcr6sw''; - }; - redis_3_0_5 = { - basename = ''redis''; - meta = { - description = ''A Ruby client library for Redis''; - homepage = ''https://github.com/redis/redis-rb''; - longDescription = '' A Ruby client that tries to match Redis' API one-to-one, while still - providing an idiomatic interface. It features thread-safety, - client-side sharding, pipelining, and an obsession for performance. -''; - }; - name = ''redis-3.0.5''; - requiredGems = [ ]; - sha256 = ''01gg3mgh3yznfhxschcka593a3ivsyw5g5vr0g5apiz4lfh6dlkn''; - }; - redis_namespace_1_3_1 = { - basename = ''redis_namespace''; - meta = { - description = ''Namespaces Redis commands.''; - homepage = ''http://github.com/resque/redis-namespace''; - longDescription = ''Adds a Redis::Namespace class which can be used to namespace calls -to Redis. This is useful when using a single instance of Redis with -multiple, different applications. -''; - }; - name = ''redis-namespace-1.3.1''; - requiredGems = [ g.redis_3_0_5 ]; - sha256 = ''1l6a64z09ni5pi6mbgvsph0lp14cnp180aj7mxnq2nb38sig4iw5''; + sha256 = ''1g70vsgv7mdwcyk9rxja7wm4qqap67prqwkj335c460vlzs6pqii''; }; remote_syslog_1_6_14 = { basename = ''remote_syslog''; @@ -1985,52 +1468,16 @@ multiple, different applications. requiredGems = [ g.servolux_0_10_0 g.file_tail_1_0_12 g.eventmachine_1_0_3 g.eventmachine_tail_0_6_4 g.syslog_protocol_0_9_2 g.em_resolv_replace_1_1_3 ]; sha256 = ''1f2yjyqhbdc4vlx52zli1b33f6yn8qc1kd4n0dpv27zswj9qfdkr''; }; - resque_1_25_1 = { - basename = ''resque''; - meta = { - description = ''Resque is a Redis-backed queueing system.''; - homepage = ''http://github.com/defunkt/resque''; - longDescription = '' Resque is a Redis-backed Ruby library for creating background jobs, - placing those jobs on multiple queues, and processing them later. - - Background jobs can be any Ruby class or module that responds to - perform. Your existing classes can easily be converted to background - jobs or you can create new classes specifically to do work. Or, you - can do both. - - Resque is heavily inspired by DelayedJob (which rocks) and is - comprised of three parts: - - * A Ruby library for creating, querying, and processing jobs - * A Rake task for starting a worker which processes jobs - * A Sinatra app for monitoring queues, jobs, and workers. -''; - }; - name = ''resque-1.25.1''; - requiredGems = [ g.redis_namespace_1_3_1 g.vegas_0_1_11 g.sinatra_1_4_4 g.multi_json_1_8_2 g.mono_logger_1_1_0 ]; - sha256 = ''0p9kpj900cyb888wmpqx6ms9b0hza09glr4cvrwqwp1vqya25lpy''; - }; - resque_web_0_0_3 = { - basename = ''resque_web''; - meta = { - description = ''Rails-based Resque web interface''; - homepage = ''https://github.com/resque/resque-web''; - longDescription = ''A Rails-based frontend to the Resque job queue system.''; - }; - name = ''resque-web-0.0.3''; - requiredGems = [ g.resque_1_25_1 g.twitter_bootstrap_rails_2_2_8 g.jquery_rails_3_0_4 g.sass_rails_4_0_1 g.coffee_rails_4_0_1 ]; - sha256 = ''1v4g0zrlq9n0pkhdiwxqcmis5p8hpxm475vchldk63mi1vy4fvr2''; - }; - rest_client_1_6_7 = { - basename = ''rest_client''; + riemann_dash_0_2_9 = { + basename = ''riemann_dash''; meta = { - description = ''Simple HTTP and REST client for Ruby, inspired by microframework syntax for specifying actions.''; - homepage = ''http://github.com/archiloque/rest-client''; - longDescription = ''A simple HTTP and REST client for Ruby, inspired by the Sinatra microframework style of specifying actions: get, put, post, delete.''; + description = ''HTTP dashboard for the distributed event system Riemann.''; + homepage = ''https://github.com/aphyr/riemann-dash''; + longDescription = ''HTTP dashboard for the distributed event system Riemann.''; }; - name = ''rest-client-1.6.7''; - requiredGems = [ g.mime_types_2_0 ]; - sha256 = ''0nn7zalgidz2yj0iqh3xvzh626krm2al79dfiij19jdhp0rk8853''; + name = ''riemann-dash-0.2.9''; + requiredGems = [ g.erubis_2_7_0 g.sinatra_1_4_5 g.sass_3_4_1 g.webrick_1_3_1 g.multi_json_1_3_6 ]; + sha256 = ''0ws5wmjbv8w9lcr3i2mdinj2qm91p6c85k6c067i67cf0p90jxq3''; }; right_aws_3_1_0 = { basename = ''right_aws''; @@ -2077,10 +1524,10 @@ The RightScale AWS gems comprise: ''; }; name = ''right_aws-3.1.0''; - requiredGems = [ g.right_http_connection_1_4_0 ]; + requiredGems = [ g.right_http_connection_1_5_0 ]; sha256 = ''1a3l5vyvq078nq976rzkrd6fbj522sbgrxpdq3p9z373h0awha09''; }; - right_http_connection_1_4_0 = { + right_http_connection_1_5_0 = { basename = ''right_http_connection''; meta = { description = ''RightScale's robust HTTP/S connection module''; @@ -2095,11 +1542,11 @@ algorithm for low-level network errors. - HTTPS certificate checking ''; }; - name = ''right_http_connection-1.4.0''; + name = ''right_http_connection-1.5.0''; requiredGems = [ ]; - sha256 = ''0m4phly7srnwyvfqp01lpaxrgrybhszar0p23zl8b12r6bdjl84g''; + sha256 = ''0shd8v24aqxdvim1gdqzwxpanjhfgkhdaw0m0lzz7sybkb02j8qf''; }; - rjb_1_4_2 = { + rjb_1_4_8 = { basename = ''rjb''; meta = { description = ''Ruby Java bridge''; @@ -2107,11 +1554,11 @@ 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.4.2''; + name = ''rjb-1.4.8''; requiredGems = [ ]; - sha256 = ''1cgbwpc45djs0mw05ydxf5apmb9ibj61n240ylqwzrajf13banzh''; + sha256 = ''06ps4ssaxb8jwja53h7v7kb31hsdr997b8na89d1yasm5zyraliw''; }; - rjb_1_4_8 = { + rjb_1_4_9 = { basename = ''rjb''; meta = { description = ''Ruby Java bridge''; @@ -2119,33 +1566,21 @@ 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.4.8''; + name = ''rjb-1.4.9''; requiredGems = [ ]; - sha256 = ''06ps4ssaxb8jwja53h7v7kb31hsdr997b8na89d1yasm5zyraliw''; + sha256 = ''062f7bjwz6iz6da49nzzbbx4xn8ahqqha2smqvqhbf0i7kd5v0yz''; }; - rkelly_remix_0_0_4 = { + rkelly_remix_0_0_6 = { basename = ''rkelly_remix''; meta = { - description = ''Fork of the RKelly library to make it suitable as the JavaScript parser in JSDuck''; - longDescription = ''Fork of the RKelly library to make it suitable as the JavaScript parser -in JSDuck. - -* http://rkelly.rubyforge.org/''; - }; - name = ''rkelly-remix-0.0.4''; - requiredGems = [ ]; - sha256 = ''1w6yr5n3b8yd0rsba9q3zyxr0n2hbpkz4v2k1qx6j1ywvl9rc2c1''; - }; - rmagick_2_13_2 = { - basename = ''rmagick''; - meta = { - description = ''Ruby binding to ImageMagick''; - homepage = ''http://rubyforge.org/projects/rmagick''; - longDescription = ''RMagick is an interface between Ruby and ImageMagick.''; + description = ''RKelly Remix is a fork of the RKelly[https://github.com/tenderlove/rkelly] JavaScript parser.''; + homepage = ''https://github.com/nene/rkelly-remix''; + longDescription = ''RKelly Remix is a fork of the +RKelly[https://github.com/tenderlove/rkelly] JavaScript parser.''; }; - name = ''rmagick-2.13.2''; + name = ''rkelly-remix-0.0.6''; requiredGems = [ ]; - sha256 = ''1fw5rs5yqi5ayh44d18gjq68chiz14byx01h33c8jvkdxz3b9wz4''; + sha256 = ''1ihsns5v8nx96gvj7sqw5m8d6dsnmpfzpd07y860bldjhkjsxp1z''; }; rmail_1_0_0 = { basename = ''rmail''; @@ -2158,94 +1593,82 @@ in JSDuck. requiredGems = [ ]; sha256 = ''0nsg7yda1gdwa96j4hlrp2s0m06vrhcc4zy5mbq7gxmlmwf9yixp''; }; - rmail_sup_1_0_1 = { - basename = ''rmail_sup''; - meta = { - description = ''A MIME mail parsing and generation library.''; - homepage = ''http://supmua.org''; - longDescription = '' RMail is a lightweight mail library containing various utility classes and - modules that allow ruby scripts to parse, modify, and generate MIME mail - messages. -''; - }; - name = ''rmail-sup-1.0.1''; - requiredGems = [ ]; - sha256 = ''1xswk101s560lxqaax3plqh8vjx7jjspnggdwb3q80m358f92q9g''; - }; - rspec_2_11_0 = { + rspec_2_14_1 = { basename = ''rspec''; meta = { - description = ''rspec-2.11.0''; + description = ''rspec-2.14.1''; homepage = ''http://github.com/rspec''; longDescription = ''BDD for Ruby''; }; - name = ''rspec-2.11.0''; - requiredGems = [ g.rspec_core_2_11_1 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 ]; - sha256 = ''0k55akvs2xhs57kz81g37s4v56vybq46sjs7f8wpybrwxryg1vxs''; + name = ''rspec-2.14.1''; + requiredGems = [ g.rspec_core_2_14_8 g.rspec_expectations_2_14_5 g.rspec_mocks_2_14_6 ]; + sha256 = ''134y4wzk1prninb5a0bhxgm30kqfzl8dg06af4js5ylnhv2wd7sg''; + }; + rspec_core_2_14_5 = { + basename = ''rspec_core''; + meta = { + description = ''rspec-core-2.14.5''; + homepage = ''http://github.com/rspec/rspec-core''; + longDescription = ''BDD for Ruby. RSpec runner and example groups.''; + }; + name = ''rspec-core-2.14.5''; + requiredGems = [ ]; + sha256 = ''18zk2y5agzj4ps16hh1jlcqmyj0bmlcr24bl0m8gyhwf0gk1xmcr''; }; - rspec_core_2_11_1 = { + rspec_core_2_14_8 = { basename = ''rspec_core''; meta = { - description = ''rspec-core-2.11.1''; + description = ''rspec-core-2.14.8''; homepage = ''http://github.com/rspec/rspec-core''; longDescription = ''BDD for Ruby. RSpec runner and example groups.''; }; - name = ''rspec-core-2.11.1''; + name = ''rspec-core-2.14.8''; requiredGems = [ ]; - sha256 = ''035ki561pryy05y8cvv3mkihjwp9r2ychnazb7s33gl7q0l0jni4''; + sha256 = ''0psjy5kdlz3ph39br0m01w65i1ikagnqlg39f8p65jh5q7dz8hwc''; }; - rspec_expectations_2_11_3 = { + rspec_expectations_2_14_3 = { basename = ''rspec_expectations''; meta = { - description = ''rspec-expectations-2.11.3''; + description = ''rspec-expectations-2.14.3''; homepage = ''http://github.com/rspec/rspec-expectations''; longDescription = ''rspec expectations (should[_not] and matchers)''; }; - name = ''rspec-expectations-2.11.3''; - requiredGems = [ g.diff_lcs_1_1_3 ]; - sha256 = ''0vqqw4hkaff6v6i6kinki4jxp9xv8b2nbmz91qa1yhjd3wr14ai5''; + name = ''rspec-expectations-2.14.3''; + requiredGems = [ g.diff_lcs_1_2_5 ]; + sha256 = ''0gv5sqizmw0hdj1gl57mynp5i27kj4i0gpksrwwg9gazciq898n2''; }; - rspec_mocks_2_11_3 = { + rspec_expectations_2_14_5 = { + basename = ''rspec_expectations''; + meta = { + description = ''rspec-expectations-2.14.5''; + homepage = ''http://github.com/rspec/rspec-expectations''; + longDescription = ''rspec expectations (should[_not] and matchers)''; + }; + name = ''rspec-expectations-2.14.5''; + requiredGems = [ g.diff_lcs_1_2_5 ]; + sha256 = ''1ni8kw8kjv76jvwjzi4jba00k3qzj9f8wd94vm6inz0jz3gwjqf9''; + }; + rspec_mocks_2_14_3 = { basename = ''rspec_mocks''; meta = { - description = ''rspec-mocks-2.11.3''; + description = ''rspec-mocks-2.14.3''; homepage = ''http://github.com/rspec/rspec-mocks''; longDescription = ''RSpec's 'test double' framework, with support for stubbing and mocking''; }; - name = ''rspec-mocks-2.11.3''; + name = ''rspec-mocks-2.14.3''; requiredGems = [ ]; - sha256 = ''1rna3ii52rlhhca49zigk692hdcmz7qib42i4hhny478k04wx0qg''; + sha256 = ''1xfhjisvpmb212jhb3k4r1ji3rrlv509mphcf345ij5b75gaybzr''; }; - ruby_hmac_0_4_0 = { - basename = ''ruby_hmac''; + rspec_mocks_2_14_6 = { + basename = ''rspec_mocks''; meta = { - description = ''This module provides common interface to HMAC functionality''; - homepage = ''http://ruby-hmac.rubyforge.org''; - longDescription = ''This module provides common interface to HMAC functionality. HMAC is a kind of "Message Authentication Code" (MAC) algorithm whose standard is documented in RFC2104. Namely, a MAC provides a way to check the integrity of information transmitted over or stored in an unreliable medium, based on a secret key. - -Originally written by Daiki Ueno. Converted to a RubyGem by Geoffrey Grosenbach''; + description = ''rspec-mocks-2.14.6''; + homepage = ''http://github.com/rspec/rspec-mocks''; + longDescription = ''RSpec's 'test double' framework, with support for stubbing and mocking''; }; - name = ''ruby-hmac-0.4.0''; + name = ''rspec-mocks-2.14.6''; requiredGems = [ ]; - sha256 = ''01zym41f8fqbmxfz8zv19627swi62ka3gp33bfbkc87v5k7mw954''; - }; - rubyforge_2_0_4 = { - basename = ''rubyforge''; - meta = { - description = ''A script which automates a limited set of rubyforge operations''; - homepage = ''http://codeforpeople.rubyforge.org/rubyforge/''; - longDescription = ''A script which automates a limited set of rubyforge operations. - -* Run 'rubyforge help' for complete usage. -* Setup: For first time users AND upgrades to 0.4.0: - * rubyforge setup (deletes your username and password, so run sparingly!) - * edit ~/.rubyforge/user-config.yml - * rubyforge config -* For all rubyforge upgrades, run 'rubyforge config' to ensure you have latest.''; - }; - name = ''rubyforge-2.0.4''; - requiredGems = [ g.json_pure_1_8_0 ]; - sha256 = ''1wdaa4nzy39yzy848fa1rybi72qlyf9vhi1ra9wpx9rpi810fwh1''; + sha256 = ''1fwsmijd6w6cmqyh4ky2nq89jrpzh56hzmndx9wgkmdgfhfakv30''; }; rubyzip_0_9_9 = { basename = ''rubyzip''; @@ -2257,43 +1680,17 @@ Originally written by Daiki Ueno. Converted to a RubyGem by Geoffrey Grosenbach' requiredGems = [ ]; sha256 = ''1khf6d903agnwd8965f5f8b353rzmfvygxp53z1199rqzw8h46q2''; }; - rubyzip_1_1_0 = { + rubyzip_1_1_6 = { basename = ''rubyzip''; meta = { description = ''rubyzip is a ruby module for reading and writing zip files''; homepage = ''http://github.com/rubyzip/rubyzip''; }; - name = ''rubyzip-1.1.0''; + name = ''rubyzip-1.1.6''; requiredGems = [ ]; - sha256 = ''0kxpcs047fb52lz0imp6vl3hr5khqpk0jfbr2knfbp612ynzyzcl''; + sha256 = ''17ha7kmgcnhnxyfp9wgyrd2synp17v9g8j1pknhfd2v9x5g475m9''; }; - safe_yaml_0_9_7 = { - basename = ''safe_yaml''; - meta = { - description = ''SameYAML provides an alternative implementation of YAML.load suitable for accepting user input in Ruby applications.''; - homepage = ''http://dtao.github.com/safe_yaml/''; - longDescription = ''Parse YAML safely, without that pesky arbitrary object deserialization vulnerability''; - }; - name = ''safe_yaml-0.9.7''; - requiredGems = [ ]; - sha256 = ''0y34vpak8gim18rq02rgd144jsvk5is4xni16wm3shbhivzqb4hk''; - }; - sass_3_2_10 = { - basename = ''sass''; - meta = { - description = ''A powerful but elegant CSS compiler that makes CSS fun again.''; - homepage = ''http://sass-lang.com/''; - longDescription = '' Sass makes CSS fun again. Sass is an extension of CSS3, adding - nested rules, variables, mixins, selector inheritance, and more. - It's translated to well-formatted, standard CSS using the - command line tool or a web-framework plugin. -''; - }; - name = ''sass-3.2.10''; - requiredGems = [ ]; - sha256 = ''0anfff4hz8fz1wbimmp9vv4mjfl1swg7ww74j549788x41l4x283''; - }; - sass_3_2_12 = { + sass_3_4_1 = { basename = ''sass''; meta = { description = ''A powerful but elegant CSS compiler that makes CSS fun again.''; @@ -2304,31 +1701,20 @@ Originally written by Daiki Ueno. Converted to a RubyGem by Geoffrey Grosenbach' command line tool or a web-framework plugin. ''; }; - name = ''sass-3.2.12''; + name = ''sass-3.4.1''; requiredGems = [ ]; - sha256 = ''074118ia17nx68i97mbkly2f08y57j52b2yfhdc3s02s4s5593f8''; + sha256 = ''0f997m7g6gcd4yaxxrf1nylk2x8ynf7w2l631sby51zfn21rfli4''; }; - sass_rails_4_0_1 = { - basename = ''sass_rails''; - meta = { - description = ''Sass adapter for the Rails asset pipeline.''; - homepage = ''https://github.com/rails/sass-rails''; - longDescription = ''Sass adapter for the Rails asset pipeline.''; - }; - name = ''sass-rails-4.0.1''; - requiredGems = [ g.sass_3_2_12 g.railties_4_0_0 g.sprockets_rails_2_0_1 ]; - sha256 = ''01sacnipgvl7ad39zzbr6iip6jja7blxfbpjg2dnm6w8gi6smxh1''; - }; - selenium_webdriver_2_35_1 = { + selenium_webdriver_2_42_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.35.1''; - requiredGems = [ g.multi_json_1_7_9 g.rubyzip_0_9_9 g.childprocess_0_3_9 g.websocket_1_0_7 ]; - sha256 = ''0251nbh6kbb96dv21n6fgbnw31p5gqr7anvhl8phrar5ylircqj6''; + name = ''selenium-webdriver-2.42.0''; + requiredGems = [ g.multi_json_1_10_1 g.rubyzip_1_1_6 g.childprocess_0_5_3 g.websocket_1_0_7 ]; + sha256 = ''04yjwzc7cy2ax5xgp618z9jbm55cx4b5l546l7xnxj1hk30znw6q''; }; servolux_0_10_0 = { basename = ''servolux''; @@ -2352,81 +1738,51 @@ interpreters.''; longDescription = ''Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort.''; }; name = ''sinatra-1.3.2''; - requiredGems = [ g.rack_1_5_2 g.rack_protection_1_5_0 g.tilt_1_4_1 ]; + requiredGems = [ g.rack_1_5_2 g.rack_protection_1_5_3 g.tilt_1_4_1 ]; sha256 = ''05blf915zpiwyz7agcn9rwdmddwxz0z4l3gd4qlqmrgd2vkw4sxc''; }; - sinatra_1_4_4 = { + sinatra_1_4_5 = { basename = ''sinatra''; meta = { description = ''Classy web-development dressed in a DSL''; homepage = ''http://www.sinatrarb.com/''; longDescription = ''Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort.''; }; - name = ''sinatra-1.4.4''; - requiredGems = [ g.rack_1_5_2 g.tilt_1_4_1 g.rack_protection_1_5_1 ]; - sha256 = ''12iy0f92d3zyk4759flgcracrbzc3x6cilpgdkzhzgjrsm9aa5hs''; - }; - slop_3_4_6 = { - basename = ''slop''; - meta = { - description = ''Simple Lightweight Option Parsing''; - homepage = ''http://github.com/injekt/slop''; - longDescription = ''A simple DSL for gathering options and parsing the command line''; - }; - name = ''slop-3.4.6''; - requiredGems = [ ]; - sha256 = ''0fdp3nkljjs2d5yhgjzcqi0f6xq67byfbrayg5aj7r76rsw0hmal''; + name = ''sinatra-1.4.5''; + requiredGems = [ g.rack_1_5_2 g.tilt_1_4_1 g.rack_protection_1_5_3 ]; + sha256 = ''0qyna3wzlnvsz69d21lxcm3ixq7db08mi08l0a88011qi4qq701s''; }; - slop_3_4_7 = { + slop_3_6_0 = { basename = ''slop''; meta = { description = ''Simple Lightweight Option Parsing''; homepage = ''http://github.com/leejarvis/slop''; longDescription = ''A simple DSL for gathering options and parsing the command line''; }; - name = ''slop-3.4.7''; + name = ''slop-3.6.0''; requiredGems = [ ]; - sha256 = ''1x3dwljqvkzj314rwn2bxgim9xvgwnfipzg5g0kwwxfn90fpv2sn''; + sha256 = ''00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n''; }; - sprockets_2_10_0 = { + sprockets_2_12_1 = { 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.10.0''; - requiredGems = [ g.hike_1_2_3 g.multi_json_1_7_9 g.rack_1_5_2 g.tilt_1_4_1 ]; - sha256 = ''1z0kiaymvqm07wqqy479vd8a60ggr3f3520b4splljbn2055fn3s''; + name = ''sprockets-2.12.1''; + requiredGems = [ g.hike_1_2_3 g.multi_json_1_10_1 g.rack_1_5_2 g.tilt_1_4_1 ]; + sha256 = ''0fi5f32i3bj739qb0zn050k5jjkfqzkn8fjz5dfjwhmh9hl5pb1y''; }; - sprockets_rails_2_0_0 = { + sprockets_rails_2_1_3 = { basename = ''sprockets_rails''; meta = { description = ''Sprockets Rails integration''; homepage = ''https://github.com/rails/sprockets-rails''; }; - name = ''sprockets-rails-2.0.0''; - requiredGems = [ g.sprockets_2_10_0 g.actionpack_4_0_0 g.activesupport_4_0_0 ]; - sha256 = ''068w0ly7x1vciy4j6mwgsnz6a983pld4rzk1fpvfsmkdqcizb20x''; - }; - sprockets_rails_2_0_1 = { - basename = ''sprockets_rails''; - meta = { - description = ''Sprockets Rails integration''; - homepage = ''https://github.com/rails/sprockets-rails''; - }; - name = ''sprockets-rails-2.0.1''; - requiredGems = [ g.sprockets_2_10_0 g.actionpack_4_0_0 g.activesupport_4_0_0 ]; - sha256 = ''170llk1qsvzhhslmasqk4hp5lrv9ibwy44q32yg6kn9s7sh0c1wy''; - }; - syntax_1_0_0 = { - basename = ''syntax''; - meta = { - description = ''Syntax is Ruby library for performing simple syntax highlighting.''; - }; - name = ''syntax-1.0.0''; - requiredGems = [ ]; - sha256 = ''1z93kkhdq55vq3fg9wljhm591cj59qis58dk97l09b8bfxi2ypk0''; + name = ''sprockets-rails-2.1.3''; + requiredGems = [ g.sprockets_2_12_1 g.actionpack_4_1_5 g.activesupport_4_1_5 ]; + sha256 = ''12kdy9vjn3ygrxhn9jxxx0rvsq601vayrkgbr3rqcpyhqhl4s4wy''; }; syslog_protocol_0_9_2 = { basename = ''syslog_protocol''; @@ -2439,16 +1795,16 @@ interpreters.''; requiredGems = [ ]; sha256 = ''1yb2cmbyj0zmb2yhkgnmghcngrkhcxs4g1svcmgfj90l2hs23nmc''; }; - systemu_2_5_2 = { + systemu_2_6_4 = { basename = ''systemu''; meta = { description = ''systemu''; homepage = ''https://github.com/ahoward/systemu''; - longDescription = ''description: systemu kicks the ass''; + longDescription = ''universal capture of stdout and stderr and handling of child process pid for windows, *nix, etc.''; }; - name = ''systemu-2.5.2''; + name = ''systemu-2.6.4''; requiredGems = [ ]; - sha256 = ''0h834ajdg9w4xrijp31fn98pjfj08gi08xjvp5xh3i6hz9a25fhr''; + sha256 = ''16k94azpsy1r958r6ysk4ksnpp54rqmh5hyamad9kwc3lk83i32z''; }; taskjuggler_3_5_0 = { basename = ''taskjuggler''; @@ -2467,84 +1823,73 @@ management. ''; }; name = ''taskjuggler-3.5.0''; - requiredGems = [ g.mail_2_5_4 g.term_ansicolor_1_2_2 ]; + requiredGems = [ g.mail_2_6_1 g.term_ansicolor_1_3_0 ]; sha256 = ''0r84rlc7a6w7p9nc9mgycbs5h0hq0kzscjq7zj3296xyf0afiwj2''; }; - term_ansicolor_1_2_2 = { + term_ansicolor_1_3_0 = { basename = ''term_ansicolor''; meta = { description = ''Ruby library that colors strings using ANSI escape sequences''; homepage = ''http://flori.github.com/term-ansicolor''; longDescription = ''This library uses ANSI escape sequences to control the attributes of terminal output''; }; - name = ''term-ansicolor-1.2.2''; - requiredGems = [ g.tins_0_9_0 ]; - sha256 = ''1b41q1q6mqcgzq9fhzhmjvfg5sfs5v7gkb8z57r4hajcp89lflxr''; + name = ''term-ansicolor-1.3.0''; + requiredGems = [ g.tins_1_3_2 ]; + sha256 = ''1a2gw7gmpmx57sdpyhjwl0zn4bqp7jyjz7aslpvvphd075layp4b''; }; - terminal_notifier_1_5_1 = { + terminal_notifier_1_6_1 = { 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.5.1''; + name = ''terminal-notifier-1.6.1''; requiredGems = [ ]; - sha256 = ''1vvdfj83bsa2rglwbqmk11yghivsywl6ka76zb51c3xm7gdd768k''; + sha256 = ''0j14sblviiypzc9vb508ldd78winba4vhnm9nhg3zpq07p3528g7''; }; - text_1_2_3 = { + text_1_3_0 = { basename = ''text''; meta = { description = ''A collection of text algorithms''; homepage = ''http://github.com/threedaymonk/text''; longDescription = ''A collection of text algorithms: Levenshtein, Soundex, Metaphone, Double Metaphone, Porter Stemming''; }; - name = ''text-1.2.3''; + name = ''text-1.3.0''; requiredGems = [ ]; - sha256 = ''14p1b3m7sxjs4ckjnd1whz82hkv0cj08j3rpkvcbavwbm07zpsd0''; + sha256 = ''1bfn0rm2a7gpsxplx3dii3a7q16hi7idsqp54fh92b3j9sqgidj7''; }; - thin_1_5_1 = { + thin_1_6_2 = { 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.5.1''; + name = ''thin-1.6.2''; requiredGems = [ g.rack_1_5_2 g.eventmachine_1_0_3 g.daemons_1_1_9 ]; - sha256 = ''0hrq9m3hb6pm8yrqshhg0gafkphdpvwcqmr7k722kgdisp3w91ga''; + sha256 = ''0v90rnnai8sc40c02dxj9aawj2mi1mhjnmi4ws0rg4yrkc6fxvmq''; }; - thor_0_18_1 = { + thor_0_19_1 = { basename = ''thor''; meta = { - description = ''A scripting framework that replaces rake, sake and rubigen''; + description = ''Thor is a toolkit for building powerful command-line interfaces.''; homepage = ''http://whatisthor.com/''; - longDescription = ''A scripting framework that replaces rake, sake and rubigen''; + longDescription = ''Thor is a toolkit for building powerful command-line interfaces.''; }; - name = ''thor-0.18.1''; + name = ''thor-0.19.1''; requiredGems = [ ]; - sha256 = ''0d1g37j6sc7fkidf8rqlm3wh9zgyg3g7y8h2x1y34hmil5ywa8c3''; + sha256 = ''08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z''; }; - thread_safe_0_1_2 = { + thread_safe_0_3_4 = { basename = ''thread_safe''; meta = { description = ''A collection of data structures and utilities to make thread-safe programming in Ruby easier''; homepage = ''https://github.com/headius/thread_safe''; longDescription = ''Thread-safe collections and utilities for Ruby''; }; - name = ''thread_safe-0.1.2''; - requiredGems = [ g.atomic_1_1_13 ]; - sha256 = ''1bxyh5l11inadbk7pjyz5s98g24qj8xavh55bc56nrzj51y9aavy''; - }; - thread_safe_0_1_3 = { - basename = ''thread_safe''; - meta = { - description = ''A collection of data structures and utilities to make thread-safe programming in Ruby easier''; - homepage = ''https://github.com/headius/thread_safe''; - longDescription = ''Thread-safe collections and utilities for Ruby''; - }; - name = ''thread_safe-0.1.3''; - requiredGems = [ g.atomic_1_1_14 ]; - sha256 = ''0f2w62x5nx95d2c2lrn9v4g60xhykf8zw7jaddkrgal913dzifgq''; + name = ''thread_safe-0.3.4''; + requiredGems = [ ]; + sha256 = ''1cil2zcdzqkyr8zrwhlg7gywryg36j4mxlxw0h0x0j0wjym5nc8n''; }; tilt_1_4_1 = { basename = ''tilt''; @@ -2557,38 +1902,38 @@ management. requiredGems = [ ]; sha256 = ''00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir''; }; - timers_1_1_0 = { - basename = ''timers''; + tins_0_13_2 = { + basename = ''tins''; meta = { - description = ''Schedule procs to run after a certain time, or at periodic intervals, using any API that accepts a timeout''; - homepage = ''https://github.com/tarcieri/timers''; - longDescription = ''Pure Ruby one-shot and periodic timers''; + description = ''Useful stuff.''; + homepage = ''http://flori.github.com/tins''; + longDescription = ''All the stuff that isn't good/big enough for a real library.''; }; - name = ''timers-1.1.0''; + name = ''tins-0.13.2''; requiredGems = [ ]; - sha256 = ''0x3vnkxy3bg9f6v1nhkfqkajr19glrzkmqd5a1wy8hrylx8rdfrv''; + sha256 = ''1ygkm4ava7x6ap61qz6pn79193g6g29248fa04mwknsz6acfjs2y''; }; - tins_0_9_0 = { + tins_1_3_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.9.0''; + name = ''tins-1.3.2''; requiredGems = [ ]; - sha256 = ''17147yzxhbcby9ycswai6sgc9cxdlbfa897amjsimkyqv1lh9pbc''; + sha256 = ''1i27zj1bhmgq19f3i5i08njprfnlv3yi5frm8ax6w0b342p6v8ly''; }; - travis_1_5_3 = { + travis_1_7_1 = { basename = ''travis''; meta = { description = ''Travis CI client''; - homepage = ''https://github.com/travis-ci/travis''; + homepage = ''https://github.com/travis-ci/travis.rb''; longDescription = ''CLI and Ruby client library for Travis CI''; }; - name = ''travis-1.5.3''; - requiredGems = [ g.faraday_0_8_8 g.faraday_middleware_0_9_0 g.highline_1_6_19 g.netrc_0_7_7 g.backports_3_3_3 g.gh_0_12_0 g.launchy_2_3_0 g.pry_0_9_12_2 g.typhoeus_0_6_5 g.pusher_client_0_3_1 ]; - sha256 = ''052kqfd0280ar9ci9vplihbc4a69l06m8chfrriygvjxc14npx97''; + name = ''travis-1.7.1''; + requiredGems = [ g.faraday_0_9_0 g.faraday_middleware_0_9_1 g.highline_1_6_21 g.backports_3_6_0 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 = ''1h0xajfzkz7pdrbhs2650nl5www8qfmgazmmmw0bcr3dai5kimdf''; }; treetop_1_4_15 = { basename = ''treetop''; @@ -2597,7 +1942,7 @@ management. homepage = ''https://github.com/cjheath/treetop''; }; name = ''treetop-1.4.15''; - requiredGems = [ g.polyglot_0_3_3 g.polyglot_0_3_3 ]; + requiredGems = [ g.polyglot_0_3_5 g.polyglot_0_3_5 ]; sha256 = ''1zqj5y0mvfvyz11nhsb4d5ch0i0rfcyj64qx19mw4qhg3hh8z9pz''; }; trollop_2_0 = { @@ -2615,51 +1960,29 @@ specify.''; requiredGems = [ ]; sha256 = ''0iz5k7ax7a5jm9x6p81k6f4mgp48wxxb0j55ypnwxnznih8fsghz''; }; - twitter_bootstrap_rails_2_2_8 = { - basename = ''twitter_bootstrap_rails''; - meta = { - description = ''Bootstrap CSS toolkit for Rails 3.1 Asset Pipeline''; - homepage = ''https://github.com/seyhunak/twitter-bootstrap-rails''; - longDescription = ''twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for Rails 3.1 Asset Pipeline''; - }; - name = ''twitter-bootstrap-rails-2.2.8''; - requiredGems = [ g.railties_4_0_0 g.actionpack_4_0_0 g.execjs_2_0_2 g.rails_4_0_0 ]; - sha256 = ''06n836l2kj5ld7w6b1pb5q423mhqnahf4phk5ai5vl927p4g3bgy''; - }; - typhoeus_0_6_5 = { + typhoeus_0_6_9 = { basename = ''typhoeus''; meta = { description = ''Parallel HTTP library on top of libcurl multi.''; homepage = ''https://github.com/typhoeus/typhoeus''; longDescription = ''Like a modern code version of the mythical beast with 100 serpent heads, Typhoeus runs HTTP requests in parallel while cleanly encapsulating handling logic.''; }; - name = ''typhoeus-0.6.5''; - requiredGems = [ g.ethon_0_6_1 ]; - sha256 = ''13xwy86iv98ypagrb6d95k1xf6yllnfqnh4ipfqix87npirjaxji''; + name = ''typhoeus-0.6.9''; + requiredGems = [ g.ethon_0_7_1 ]; + sha256 = ''1j4l2zwx821hzsfqskcq47xpk6b7yzl30mhzmdrfrsrhsigmayar''; }; - tzinfo_0_3_37 = { + tzinfo_1_2_2 = { basename = ''tzinfo''; meta = { - description = ''Daylight-savings aware timezone library''; - homepage = ''http://tzinfo.rubyforge.org/''; - longDescription = ''TZInfo is a Ruby library that uses the standard tz (Olson) database to provide daylight savings aware transformations between times in different time zones.''; - }; - name = ''tzinfo-0.3.37''; - requiredGems = [ ]; - sha256 = ''0pi2vabsg73h6z4wfwyd27k63issp2qp1nh0vd74rdk740gmb3kc''; - }; - tzinfo_0_3_38 = { - basename = ''tzinfo''; - meta = { - description = ''Daylight-savings aware timezone library''; + description = ''Daylight savings aware timezone library''; homepage = ''http://tzinfo.github.io''; - longDescription = ''TZInfo is a Ruby library that uses the standard tz (Olson) database to provide daylight savings aware transformations between times in different time zones.''; + longDescription = ''TZInfo provides daylight savings aware transformations between times in different time zones.''; }; - name = ''tzinfo-0.3.38''; - requiredGems = [ ]; - sha256 = ''1s339ravgk0rqm5dhv1l0yi81sczjvdiryn8ihi2czkb0md55j68''; + name = ''tzinfo-1.2.2''; + requiredGems = [ g.thread_safe_0_3_4 ]; + sha256 = ''1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx''; }; - unf_0_1_2 = { + unf_0_1_4 = { basename = ''unf''; meta = { description = ''A wrapper library to bring Unicode Normalization Form support to Ruby/JRuby''; @@ -2668,9 +1991,9 @@ specify.''; to Ruby/JRuby. ''; }; - name = ''unf-0.1.2''; + name = ''unf-0.1.4''; requiredGems = [ g.unf_ext_0_0_6 ]; - sha256 = ''1g6agdd14yylawwd9ifgcpxwfyiydqj9l7cq6ipypj70v1l46i1s''; + sha256 = ''0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9''; }; unf_ext_0_0_6 = { basename = ''unf_ext''; @@ -2683,17 +2006,6 @@ to Ruby/JRuby. requiredGems = [ ]; sha256 = ''07zbmkzcid6pzdqgla3456ipfdka7j1v4hsx1iaa8rbnllqbmkdg''; }; - unicode_0_4_4 = { - basename = ''unicode''; - meta = { - description = ''Unicode normalization library.''; - homepage = ''http://www.yoshidam.net/Ruby.html#unicode''; - longDescription = ''Unicode normalization library.''; - }; - name = ''unicode-0.4.4''; - requiredGems = [ ]; - sha256 = ''0la9dyxj7pr57g5727gj1h5c6h5kpbjdjpiv2vqi5gw5iglg0yqi''; - }; uuid_2_3_7 = { basename = ''uuid''; meta = { @@ -2704,31 +2016,18 @@ to Ruby/JRuby. ''; }; name = ''uuid-2.3.7''; - requiredGems = [ g.macaddr_1_6_1 ]; + requiredGems = [ g.macaddr_1_7_1 ]; sha256 = ''04q10an3v40zwjihvdwm23fw6vl39fbkhdiwfw78a51ym9airnlp''; }; - uuidtools_2_1_4 = { - basename = ''uuidtools''; + webrick_1_3_1 = { + basename = ''webrick''; meta = { - description = ''UUID generator''; - homepage = ''http://uuidtools.rubyforge.org/''; - longDescription = ''A simple universally unique ID generation library. -''; + description = ''WEBrick is an HTTP server toolkit that can be configured as an HTTPS server,''; + homepage = ''http://github.com/nahi/webrick''; }; - name = ''uuidtools-2.1.4''; + name = ''webrick-1.3.1''; requiredGems = [ ]; - sha256 = ''1w0bhnkp5515f3yx5fakfrfkawxjpb4fjm1r2c6lk691xlr696s3''; - }; - vegas_0_1_11 = { - basename = ''vegas''; - meta = { - description = ''Vegas aims to solve the simple problem of creating executable versions of Sinatra/Rack apps.''; - homepage = ''http://code.quirkey.com/vegas''; - longDescription = ''Vegas aims to solve the simple problem of creating executable versions of Sinatra/Rack apps. It includes a class Vegas::Runner that wraps Rack/Sinatra applications and provides a simple command line interface and launching mechanism.''; - }; - name = ''vegas-0.1.11''; - requiredGems = [ g.rack_1_5_2 ]; - sha256 = ''0kzv0v1zb8vvm188q4pqwahb6468bmiamn6wpsbiq6r5i69s1bs5''; + sha256 = ''0s42mxihcl2bx0h9q0v2syl70qndydfkl39a06h9il17p895ya8g''; }; webrobots_0_1_1 = { basename = ''webrobots''; @@ -2753,6 +2052,17 @@ to Ruby/JRuby. requiredGems = [ ]; sha256 = ''1jrfz4295qbnjaxv37fw9jzxyxz61izp7c0683mnscacpx262zw0''; }; + websocket_1_2_0 = { + basename = ''websocket''; + meta = { + description = ''Universal Ruby library to handle WebSocket protocol''; + homepage = ''http://github.com/imanel/websocket-ruby''; + longDescription = ''Universal Ruby library to handle WebSocket protocol''; + }; + name = ''websocket-1.2.0''; + requiredGems = [ ]; + sha256 = ''17q3fsqwa44cali3x852jzjpzgcvvly0n8gszmkaqx520lb9r5l4''; + }; xapian_full_1_2_3 = { basename = ''xapian_full''; meta = { @@ -2763,35 +2073,25 @@ to Ruby/JRuby. requiredGems = [ ]; sha256 = ''02z0wsir38jsp5d6sqrkgv5prk8s6sdf6g2h718j2374kpnkyrxv''; }; - xapian_ruby_1_2_15_1 = { + xapian_ruby_1_2_17 = { basename = ''xapian_ruby''; meta = { description = ''xapian libraries and ruby bindings''; homepage = ''https://github.com/garaio/xapian-ruby''; }; - name = ''xapian-ruby-1.2.15.1''; + name = ''xapian-ruby-1.2.17''; requiredGems = [ ]; - sha256 = ''02v3l931246asbcivkr4j0x99pl4i4fjvfsr8ga8v6lkvz0ls1xp''; + sha256 = ''1vhqykr0b877pb8x5n3v4fb4znm92mqhijinss7mvqzfimwfbxfg''; }; - xml_simple_1_1_1 = { + xml_simple_1_1_2 = { basename = ''xml_simple''; meta = { description = ''A simple API for XML processing.''; - homepage = ''http://xml-simple.rubyforge.org''; - }; - name = ''xml-simple-1.1.1''; - requiredGems = [ ]; - sha256 = ''0zlwz8kvpm45m227aazg369fapbqyhvd5v9aga8cvxyhqnq0b87i''; - }; - yajl_ruby_1_1_0 = { - basename = ''yajl_ruby''; - meta = { - description = ''Ruby C bindings to the excellent Yajl JSON stream-based parser library.''; - homepage = ''http://github.com/brianmario/yajl-ruby''; + homepage = ''https://github.com/maik/xml-simple''; }; - name = ''yajl-ruby-1.1.0''; + name = ''xml-simple-1.1.2''; requiredGems = [ ]; - sha256 = ''0sj46j47icb12hdhcfh76rnvddyiic5ifqzkh3kla1vcr505kf4m''; + sha256 = ''0ni8cbkj7l2k5pc4fs2jzp1ymxy4xqa2jc681l4y9iy9chrayddb''; }; }; } diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix index 10cbf1ecfe5..9d694eac1e4 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 }: +, pkgconfig, libiconv }: let @@ -80,9 +80,10 @@ in }; nokogiri = { + buildInputs = [ libxml2 ]; buildFlags = [ "--with-xml2-dir=${libxml2} --with-xml2-include=${libxml2}/include/libxml2" - "--with-xslt-dir=${libxslt}" + "--with-xslt-dir=${libxslt} --with-iconv-dir=${libiconv} --use-system-libraries" ]; }; diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix new file mode 100644 index 00000000000..98e1edee387 --- /dev/null +++ b/pkgs/development/interpreters/self/default.nix @@ -0,0 +1,44 @@ +{ fetchurl, fetchgit, stdenv, xlibs, gcc44, makeWrapper, ncurses, cmake }: + +stdenv.mkDerivation rec { + # The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self + # so that it can be written to when using the Self transposer. Running 'Self' + # after installation runs without an image. You can then build a Self image with: + # $ cd ~/.local/share/self/objects + # $ Self + # > 'worldBuilder.self' _RunScript + # + # This image can later be started with: + # $ Self -s myimage.snap + # + version = "4.5.0"; + name = "self-${version}"; + + src = fetchgit { + url = "https://github.com/russellallen/self"; + rev = "d16bcaad3c5092dae81ad0b16d503f2a53b8ef86"; + sha256 = "966025b71542e44fc830b951f404f5721ad410ed24f7236fd0cd820ea0fc5731"; + }; + + # gcc 4.6 and above causes crashes on Self startup but gcc 4.4 works. + buildInputs = [ gcc44 ncurses xlibs.libX11 xlibs.libXext makeWrapper cmake ]; + + selfWrapper = ./self; + + installPhase = '' + mkdir -p "$out"/bin + cp ./vm/Self "$out"/bin/Self.wrapped + mkdir -p "$out"/share/self + cp -r ../objects "$out"/share/self/ + makeWrapper $selfWrapper $out/bin/Self \ + --set SELF_ROOT "$out" + ''; + + meta = { + description = "A prototype-based dynamic object-oriented programming language, environment, and virtual machine"; + homepage = "http://selflanguage.org/"; + license = stdenv.lib.licenses.bsd3; + maintainer = [ stdenv.lib.maintainers.doublec ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/development/interpreters/self/self b/pkgs/development/interpreters/self/self new file mode 100755 index 00000000000..d504682086b --- /dev/null +++ b/pkgs/development/interpreters/self/self @@ -0,0 +1,18 @@ +#! /usr/bin/env bash + +export SELF_HOME="$HOME/.local/share/self" +if [ -n "$XDG_DATA_HOME" ] + then export SELF_HOME="$XDG_DATA_HOME/self" +fi + +if [ ! -d $SELF_HOME ]; then + mkdir -p $SELF_HOME +fi + +if [ ! -d $SELF_HOME/objects ]; then + mkdir -p $SELF_HOME/objects + cp -r $SELF_ROOT/share/self/objects/* $SELF_HOME/objects + chmod -R +w $SELF_HOME/objects +fi + +exec $SELF_ROOT/bin/Self.wrapped "$@" diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix new file mode 100644 index 00000000000..e41546512e9 --- /dev/null +++ b/pkgs/development/libraries/SDL2_net/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, SDL2 }: + +stdenv.mkDerivation rec { + name = "SDL2_net-2.0.0"; + + src = fetchurl { + url = "http://www.libsdl.org/projects/SDL_net/release/${name}.tar.gz"; + sha256 = "d715be30783cc99e541626da52079e308060b21d4f7b95f0224b1d06c1faacab"; + }; + + propagatedBuildInputs = [SDL2]; + + postInstall = "ln -s $out/include/SDL2/SDL_net.h $out/include/"; + + meta = with stdenv.lib; { + description = "SDL multiplatform networking library"; + homepage = https://www.libsdl.org/projects/SDL_net; + license = licenses.zlib; + maintainers = [ maintainers.MP2E ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index d2435419941..26748c5d44b 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "boehm-gc-7.2d"; + name = "boehm-gc-7.2f"; src = fetchurl { - url = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.2d.tar.gz; - sha256 = "0phwa5driahnpn79zqff14w9yc8sn3599cxz91m78hqdcpl0mznr"; + url = http://www.hboehm.info/gc/gc_source/gc-7.2f.tar.gz; + sha256 = "119x7p1cqw40mpwj80xfq879l9m1dkc7vbc1f3bz3kvkf8bf6p16"; }; outputs = [ "dev" "out" "doc" ]; diff --git a/pkgs/development/libraries/boost/1.44.nix b/pkgs/development/libraries/boost/1.44.nix index b188586e84f..c192acd23bd 100644 --- a/pkgs/development/libraries/boost/1.44.nix +++ b/pkgs/development/libraries/boost/1.44.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = { homepage = "http://boost.org/"; - description = "Boost C++ Library Collection"; + description = "Collection of C++ libraries"; license = "boost-license"; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/development/libraries/boost/1.49.nix b/pkgs/development/libraries/boost/1.49.nix index fca4249e963..9e61683238f 100644 --- a/pkgs/development/libraries/boost/1.49.nix +++ b/pkgs/development/libraries/boost/1.49.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = { homepage = "http://boost.org/"; - description = "Boost C++ Library Collection"; + description = "Collection of C++ libraries"; license = "boost-license"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/boost/1.55.nix b/pkgs/development/libraries/boost/1.55.nix index bf355f7169c..1e9d2134d12 100644 --- a/pkgs/development/libraries/boost/1.55.nix +++ b/pkgs/development/libraries/boost/1.55.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { meta = { homepage = "http://boost.org/"; - description = "Boost C++ Library Collection"; + description = "Collection of C++ libraries"; license = "boost-license"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix index 2111e1b4a55..3e75cb45a73 100644 --- a/pkgs/development/libraries/ccrtp/default.nix +++ b/pkgs/development/libraries/ccrtp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { doCheck = true; meta = { - description = "GNU ccRTP, an implementation of the IETF real-time transport protocol (RTP)"; + description = "An implementation of the IETF real-time transport protocol (RTP)"; homepage = http://www.gnu.org/software/ccrtp/; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ marcweber ]; diff --git a/pkgs/development/libraries/celt/default.nix b/pkgs/development/libraries/celt/default.nix index 28e51efbc4b..ca25be90504 100644 --- a/pkgs/development/libraries/celt/default.nix +++ b/pkgs/development/libraries/celt/default.nix @@ -29,7 +29,7 @@ rec { phaseNames = ["doConfigure" "doMakeInstall"]; meta = { - description = "CELT - low-delay audio codec"; + description = "Low-delay audio codec"; maintainers = with a.lib.maintainers; [ raskin diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix index 06f2deb3a7c..54e5988eda6 100644 --- a/pkgs/development/libraries/cfitsio/default.nix +++ b/pkgs/development/libraries/cfitsio/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = http://heasarc.gsfc.nasa.gov/fitsio/; - description = "CFITSIO, a library for reading and writing FITS data files"; + description = "Library for reading and writing FITS data files"; longDescription = '' CFITSIO is a library of C and Fortran subroutines for reading and diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index 4e75cda0c23..a782ff61e28 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { doCheck = false; meta = { - description = "Check, a unit testing framework for C"; + description = "Unit testing framework for C"; longDescription = '' Check is a unit testing framework for C. It features a simple diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index d148c4d829a..63c5959960a 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -34,6 +34,6 @@ rec { name = "chipmunk-" + version; meta = { - description = "Chipmunk 2D physics engine"; + description = "2D physics engine"; }; } diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index 40d41b633d2..010d2cb7ccc 100644 --- a/pkgs/development/libraries/chromaprint/default.nix +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fftw, boost }: +{ stdenv, fetchurl, cmake, ffmpeg, boost }: stdenv.mkDerivation rec { name = "chromaprint-${version}"; @@ -9,11 +9,17 @@ stdenv.mkDerivation rec { sha256 = "04nd8xmy4kgnpfffj6hw893f80bwhp43i01zpmrinn3497mdf53b"; }; - buildInputs = [ cmake fftw boost ]; + buildInputs = [ cmake ffmpeg boost ]; - meta = { + cmakeFlags = [ "-DBUILD_EXAMPLES=ON" ]; + + postInstall = "installBin examples/fpcalc"; + + meta = with stdenv.lib; { homepage = "http://acoustid.org/chromaprint"; description = "AcoustID audio fingerprinting library"; - license = stdenv.lib.licenses.lgpl21Plus; + maintainers = with maintainers; [ emery ]; + license = licenses.lgpl21Plus; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix index da4501285e1..7ea7e597d40 100644 --- a/pkgs/development/libraries/cloog/default.nix +++ b/pkgs/development/libraries/cloog/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "CLooG, the Chunky Loop Generator"; + description = "Library that generates loops for scanning polyhedra"; longDescription = '' CLooG is a free software library to generate code for scanning diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 59c64b0de9f..c73aac074e7 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { postBuild = "rm -rf $out/share/gtk-doc"; meta = { - description = "Clutter-GST"; + description = "GStreamer bindings for clutter"; homepage = http://www.clutter-project.org/; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 027b90d8e11..67de04050af 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { #doCheck = true; # no tests possible without a display meta = { - description = "Clutter, a library for creating fast, dynamic graphical user interfaces"; + description = "Library for creating fast, dynamic graphical user interfaces"; longDescription = '' Clutter is free software library for creating fast, compelling, diff --git a/pkgs/development/libraries/coprthr/default.nix b/pkgs/development/libraries/coprthr/default.nix index 0e521aa19e8..40be21131d2 100644 --- a/pkgs/development/libraries/coprthr/default.nix +++ b/pkgs/development/libraries/coprthr/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/browndeer/coprthr/archive/stable-${version}.zip"; - sha256 = "042aykmcxhdpck0j6k5rcp6a0b5i377fv2nz96v1bpfhzxd1mjwg"; + sha256 = "0ilx4v1ydppjnq1i0z5j0x4lmi29z39sappar7c0wqady0b5dpz9"; }; buildInputs = @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + broken = true; }; } diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 63acc14521c..6d7d7a83879 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "FOX is a C++ based class library for building Graphical User Interfaces"; + description = "C++ based class library for building Graphical User Interfaces"; longDescription = '' FOX stands for Free Objects for X. It is a C++ based class library for building Graphical User Interfaces. diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index d181bb67db4..afad9e39030 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (rec { }; meta = { - description = "GNU gettext, a well integrated set of translation tools and documentation"; + description = "Well integrated set of translation tools and documentation"; longDescription = '' Usually, programs are written and documented in English, and use diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index abb782641dd..7cab317380e 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, cmake, zlib, python}: stdenv.mkDerivation rec { - version = "0.20.0"; + version = "0.21.1"; name = "libgit2-${version}"; src = fetchurl { name = "${name}.tar.gz"; url = "https://github.com/libgit2/libgit2/tarball/v${version}"; - sha256 = "1iyncz8fqazw683dxjls3lf5pw3f5ma8kachkvjz7dsq57wxllbj"; + sha256 = "0afbvcsryg7bsmbfj23l09b1xngkmqhf043njl8wm44qslrxibkz"; }; cmakeFlags = "-DTHREADSAFE=ON"; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index be1abfb0b15..a3c0a3a59a3 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -7,6 +7,8 @@ with stdenv.lib; +assert stdenv.gcc.gcc != null; + # TODO: # * Add gio-module-fam # Problem: cyclic dependency on gamin @@ -49,7 +51,7 @@ stdenv.mkDerivation rec { sha256 = "1d98mbqjmc34s8095lkw1j1bwvnnkw9581yfvjaikjvfjsaz29qd"; }; - patches = optional stdenv.isDarwin ./darwin-compilation.patch; + patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch; #outputs = [ "dev" "out" "bin" ]; # ToDo: no idea what's wrong! docs? @@ -105,7 +107,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - description = "GLib, a C library of programming buildings blocks"; + description = "C library of programming buildings blocks"; homepage = http://www.gtk.org/; license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 raskin urkud ]; diff --git a/pkgs/development/libraries/glib/skip-timer-test.patch b/pkgs/development/libraries/glib/skip-timer-test.patch new file mode 100644 index 00000000000..942f3e7864c --- /dev/null +++ b/pkgs/development/libraries/glib/skip-timer-test.patch @@ -0,0 +1,17 @@ +Description: Skip test which performs some unreliable floating point comparisons +Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=722604 + +Index: b/glib/tests/timer.c +=================================================================== +--- a/glib/tests/timer.c ++++ b/glib/tests/timer.c +@@ -203,7 +203,7 @@ + { + g_test_init (&argc, &argv, NULL); + +- g_test_add_func ("/timer/basic", test_timer_basic); ++/* g_test_add_func ("/timer/basic", test_timer_basic);*/ +- g_test_add_func ("/timer/stop", test_timer_stop); ++/* g_test_add_func ("/timer/stop", test_timer_stop);*/ + g_test_add_func ("/timer/continue", test_timer_continue); + g_test_add_func ("/timer/reset", test_timer_reset); diff --git a/pkgs/development/libraries/glibc/2.19/common.nix b/pkgs/development/libraries/glibc/2.19/common.nix index 3611b9b4b3c..8ab96f34f7d 100644 --- a/pkgs/development/libraries/glibc/2.19/common.nix +++ b/pkgs/development/libraries/glibc/2.19/common.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation ({ ./fix-math.patch ./cve-2014-0475.patch + ./cve-2014-5119.patch ]; postPatch = '' diff --git a/pkgs/development/libraries/glibc/2.19/cve-2014-5119.patch b/pkgs/development/libraries/glibc/2.19/cve-2014-5119.patch new file mode 100644 index 00000000000..cbae03425eb --- /dev/null +++ b/pkgs/development/libraries/glibc/2.19/cve-2014-5119.patch @@ -0,0 +1,206 @@ +http://anonscm.debian.org/viewvc/pkg-glibc/glibc-package/trunk/debian/patches/any/cvs-CVE-2014-5119.diff?revision=6248&view=co + +commit a1a6a401ab0a3c9f15fb7eaebbdcee24192254e8 +Author: Florian Weimer <fweimer@redhat.com> +Date: Tue Aug 26 19:38:59 2014 +0200 + + __gconv_translit_find: Disable function [BZ #17187] + + This functionality has never worked correctly, and the implementation + contained a security vulnerability (CVE-2014-5119). + +2014-08-26 Florian Weimer <fweimer@redhat.com> + + [BZ #17187] + * iconv/gconv_trans.c (struct known_trans, search_tree, lock, + trans_compare, open_translit, __gconv_translit_find): + Remove module loading code. + +--- a/iconv/gconv_trans.c ++++ b/iconv/gconv_trans.c +@@ -238,181 +238,12 @@ __gconv_transliterate (struct __gconv_step *step, + return __GCONV_ILLEGAL_INPUT; + } + +- +-/* Structure to represent results of found (or not) transliteration +- modules. */ +-struct known_trans +-{ +- /* This structure must remain the first member. */ +- struct trans_struct info; +- +- char *fname; +- void *handle; +- int open_count; +-}; +- +- +-/* Tree with results of previous calls to __gconv_translit_find. */ +-static void *search_tree; +- +-/* We modify global data. */ +-__libc_lock_define_initialized (static, lock); +- +- +-/* Compare two transliteration entries. */ +-static int +-trans_compare (const void *p1, const void *p2) +-{ +- const struct known_trans *s1 = (const struct known_trans *) p1; +- const struct known_trans *s2 = (const struct known_trans *) p2; +- +- return strcmp (s1->info.name, s2->info.name); +-} +- +- +-/* Open (maybe reopen) the module named in the struct. Get the function +- and data structure pointers we need. */ +-static int +-open_translit (struct known_trans *trans) +-{ +- __gconv_trans_query_fct queryfct; +- +- trans->handle = __libc_dlopen (trans->fname); +- if (trans->handle == NULL) +- /* Not available. */ +- return 1; +- +- /* Find the required symbol. */ +- queryfct = __libc_dlsym (trans->handle, "gconv_trans_context"); +- if (queryfct == NULL) +- { +- /* We cannot live with that. */ +- close_and_out: +- __libc_dlclose (trans->handle); +- trans->handle = NULL; +- return 1; +- } +- +- /* Get the context. */ +- if (queryfct (trans->info.name, &trans->info.csnames, &trans->info.ncsnames) +- != 0) +- goto close_and_out; +- +- /* Of course we also have to have the actual function. */ +- trans->info.trans_fct = __libc_dlsym (trans->handle, "gconv_trans"); +- if (trans->info.trans_fct == NULL) +- goto close_and_out; +- +- /* Now the optional functions. */ +- trans->info.trans_init_fct = +- __libc_dlsym (trans->handle, "gconv_trans_init"); +- trans->info.trans_context_fct = +- __libc_dlsym (trans->handle, "gconv_trans_context"); +- trans->info.trans_end_fct = +- __libc_dlsym (trans->handle, "gconv_trans_end"); +- +- trans->open_count = 1; +- +- return 0; +-} +- +- + int + internal_function + __gconv_translit_find (struct trans_struct *trans) + { +- struct known_trans **found; +- const struct path_elem *runp; +- int res = 1; +- +- /* We have to have a name. */ +- assert (trans->name != NULL); +- +- /* Acquire the lock. */ +- __libc_lock_lock (lock); +- +- /* See whether we know this module already. */ +- found = __tfind (trans, &search_tree, trans_compare); +- if (found != NULL) +- { +- /* Is this module available? */ +- if ((*found)->handle != NULL) +- { +- /* Maybe we have to reopen the file. */ +- if ((*found)->handle != (void *) -1) +- /* The object is not unloaded. */ +- res = 0; +- else if (open_translit (*found) == 0) +- { +- /* Copy the data. */ +- *trans = (*found)->info; +- (*found)->open_count++; +- res = 0; +- } +- } +- } +- else +- { +- size_t name_len = strlen (trans->name) + 1; +- int need_so = 0; +- struct known_trans *newp; +- +- /* We have to continue looking for the module. */ +- if (__gconv_path_elem == NULL) +- __gconv_get_path (); +- +- /* See whether we have to append .so. */ +- if (name_len <= 4 || memcmp (&trans->name[name_len - 4], ".so", 3) != 0) +- need_so = 1; +- +- /* Create a new entry. */ +- newp = (struct known_trans *) malloc (sizeof (struct known_trans) +- + (__gconv_max_path_elem_len +- + name_len + 3) +- + name_len); +- if (newp != NULL) +- { +- char *cp; +- +- /* Clear the struct. */ +- memset (newp, '\0', sizeof (struct known_trans)); +- +- /* Store a copy of the module name. */ +- newp->info.name = cp = (char *) (newp + 1); +- cp = __mempcpy (cp, trans->name, name_len); +- +- newp->fname = cp; +- +- /* Search in all the directories. */ +- for (runp = __gconv_path_elem; runp->name != NULL; ++runp) +- { +- cp = __mempcpy (__stpcpy ((char *) newp->fname, runp->name), +- trans->name, name_len); +- if (need_so) +- memcpy (cp, ".so", sizeof (".so")); +- +- if (open_translit (newp) == 0) +- { +- /* We found a module. */ +- res = 0; +- break; +- } +- } +- +- if (res) +- newp->fname = NULL; +- +- /* In any case we'll add the entry to our search tree. */ +- if (__tsearch (newp, &search_tree, trans_compare) == NULL) +- { +- /* Yickes, this should not happen. Unload the object. */ +- res = 1; +- /* XXX unload here. */ +- } +- } +- } +- +- __libc_lock_unlock (lock); +- +- return res; ++ /* Transliteration module loading has been removed because it never ++ worked as intended and suffered from a security vulnerability. ++ Consequently, this function always fails. */ ++ return 1; + } diff --git a/pkgs/development/libraries/glibc/2.19/multi.nix b/pkgs/development/libraries/glibc/2.19/multi.nix new file mode 100644 index 00000000000..ad4a34152b6 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.19/multi.nix @@ -0,0 +1,31 @@ +{ runCommand, glibc, glibc32 +}: + +runCommand "${glibc.name}-multi" + { inherit glibc32; + glibc64 = glibc; + } + '' + mkdir -p $out + ln -s $glibc64/* $out/ + + rm $out/lib $out/lib64 + mkdir -p $out/lib + ln -s $glibc64/lib/* $out/lib + ln -s $glibc32/lib $out/lib/32 + ln -s lib $out/lib64 + + # fixing ldd RLTDLIST + rm $out/bin + cp -rs $glibc64/bin $out + chmod u+w $out/bin + rm $out/bin/ldd + sed -e "s|^RTLDLIST=.*$|RTLDLIST=\"$out/lib/ld-2.19.so $out/lib/32/ld-linux.so.2\"|g" \ + $glibc64/bin/ldd > $out/bin/ldd + chmod 555 $out/bin/ldd + + rm $out/include + cp -rs $glibc32/include $out + chmod -R u+w $out/include + cp -rsf $glibc64/include $out + '' diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index 098643ae70f..d3f74f4043a 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://code.google.com/p/google-glog/; license = "BSD"; - description = "The glog library implements application-level logging."; + description = "Library for application-level logging"; }; } diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix index d0559c46795..e9cfda032b1 100644 --- a/pkgs/development/libraries/gmp/4.3.2.nix +++ b/pkgs/development/libraries/gmp/4.3.2.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - description = "GMP, the GNU multiple precision arithmetic library"; + description = "GNU multiple precision arithmetic library"; longDescription = '' GMP is a free library for arbitrary precision arithmetic, operating diff --git a/pkgs/development/libraries/gmp/5.0.5.nix b/pkgs/development/libraries/gmp/5.0.5.nix index c96c830e2f7..5f3690f67a9 100644 --- a/pkgs/development/libraries/gmp/5.0.5.nix +++ b/pkgs/development/libraries/gmp/5.0.5.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "GMP, the GNU multiple precision arithmetic library"; + description = "GNU multiple precision arithmetic library"; longDescription = '' GMP is a free library for arbitrary precision arithmetic, operating diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index 79b29ee3f03..573b7cbe2ee 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://gmplib.org/"; - description = "GMP, the GNU multiple precision arithmetic library"; + description = "GNU multiple precision arithmetic library"; license = licenses.gpl3Plus; longDescription = diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix index 207b8248698..75ae4054592 100644 --- a/pkgs/development/libraries/gss/default.nix +++ b/pkgs/development/libraries/gss/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU GSS Generic Security Service"; + description = "Generic Security Service"; longDescription = '' GSS is an implementation of the Generic Security Service Application diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index d86e450477d..a02af7f0cd7 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, python, gst-plugins-base, orc , faacSupport ? false, faac ? null , faad2, libass, libkate, libmms -, libmodplug, mpeg2dec, mpg123 +, libmodplug, mpeg2dec, mpg123 , openjpeg, libopus, librsvg , wildmidi, fluidsynth, libvdpau, wayland , libwebp, xvidcore, gnutls @@ -10,7 +10,7 @@ assert faacSupport -> faac != null; stdenv.mkDerivation rec { - name = "gst-plugins-bad-1.4.0"; + name = "gst-plugins-bad-1.4.1"; meta = with stdenv.lib; { description = "Gstreamer Bad Plugins"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz"; - sha256 = "1y821785rvr6s79cmdll66hg6h740qa2n036xid20nvjyxabfb7z"; + sha256 = "0268db2faaf0bb22e5b709a11633abbca4f3d289b1f513bb262d0bf3f53e19ae"; }; nativeBuildInputs = [ pkgconfig python ]; diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 9ae5f194fa2..3b9e94f4c65 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.0"; + name = "gst-plugins-base-1.4.1"; 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 = "07jcs08hjyban0amls5s0g6i4a1hwiir1llwpqzlwkmnhfwx9bjx"; + sha256 = "aea9e25be6691bd3cc0785d005b2b5d70ce313a2c897901680a3f7e7cab5a499"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index a99c0f14ecc..8e9a2b87a01 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, pkgconfig, perl, bison, flex, python, gobjectIntrospection -, glib +, glib }: stdenv.mkDerivation rec { - name = "gstreamer-1.4.0"; + name = "gstreamer-1.4.1"; meta = { description = "Open source multimedia framework"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer/${name}.tar.xz"; - sha256 = "15f68pn2b47x543ih7hj59czgzl4af14j15bgjq8ky145gf9zhr3"; + sha256 = "5638f75003282135815c0077d491da11e9a884ad91d4ba6ab3cc78bae0fb452e"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 69ffa81cb25..176814c5ecd 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.0"; + name = "gst-plugins-good-1.4.1"; 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 = "11965w4zr0jvrsnw33rbcc8d20dlh368rz0x16d2iypzhxwjx9j8"; + sha256 = "8559d4270065b30ed5c49b826e1b7a3a2bd5ee9a340ae745a2ae3f9718e4c637"; }; nativeBuildInputs = [ pkgconfig python ]; diff --git a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix index ff26e727e9f..777f4a06313 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gstreamer.freedesktop.org/modules/gnonlin.html"; - description = "http://gstreamer.freedesktop.org/modules/gnonlin.html"; + description = "Gstreamer Non-Linear Multimedia Editing Plugins"; license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix index f781c624cea..b608f891533 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://gstreamer.freedesktop.org; - description = "GStreamer, a library for constructing graphs of media-handling components"; + description = "Library for constructing graphs of media-handling components"; longDescription = '' GStreamer is a library for constructing graphs of media-handling diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index ee4b3c392dd..e25492c1d13 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.0"; + name = "gst-libav-1.4.1"; 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 = "1073p7xdpr3pwyx37fnldfni908apnq3k9fbqmxf5wk3g1jplb68"; + sha256 = "fc125521187fa84f3210269a0eecc51f8a856802f1ca4bb251f118dab90c5a9d"; }; configureFlags = stdenv.lib.optionalString withSystemLibav diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index da37280af99..6a80514e8a1 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.0"; + name = "gst-plugins-ugly-1.4.1"; 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 = "0kblc5f4n0mh2sw8dhf7c9dg3wzm7a0p7pqpcff7n6ixy5hbn52k"; + sha256 = "25440435ac4ed795d213f2420a0e7355e4a2e2e76d1f9d020b2073f815e8b071"; }; nativeBuildInputs = [ pkgconfig python ]; diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 6106c786590..2d659d45ea6 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -37,6 +37,13 @@ stdenv.mkDerivation rec { then "--disable-glibtest --disable-introspection --disable-visibility" else "--with-xinput=yes"; + passthru = { + gtkExeEnvPostBuild = '' + rm $out/lib/gtk-2.0/2.10.0/immodules.cache + $out/bin/gtk-query-immodules-2.0 $out/lib/gtk-2.0/2.10.0/immodules/*.so > $out/lib/gtk-2.0/2.10.0/immodules.cache + ''; # workaround for bug of nix-mode for Emacs */ ''; + }; + meta = with stdenv.lib; { description = "A multi-platform toolkit for creating graphical user interfaces"; homepage = http://www.gtk.org/; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 09221502e36..fa350110476 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -38,6 +38,13 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/share/gtk-doc"; + passthru = { + gtkExeEnvPostBuild = '' + rm $out/lib/gtk-3.0/3.0.0/immodules.cache + $out/bin/gtk-query-immodules-3.0 $out/lib/gtk-3.0/3.0.0/immodules/*.so > $out/lib/gtk-3.0/3.0.0/immodules.cache + ''; # workaround for bug of nix-mode for Emacs */ ''; + }; + meta = { description = "A multi-platform toolkit for creating graphical user interfaces"; diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/development/libraries/gtkimageview/default.nix index 6905adcd71e..b57c91c4455 100644 --- a/pkgs/development/libraries/gtkimageview/default.nix +++ b/pkgs/development/libraries/gtkimageview/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://trac.bjourne.webfactional.com/; - description = "The GtkImageView image viewer widget for GTK+"; + description = "Image viewer widget for GTK+"; longDescription = '' GtkImageView is a simple image viewer widget for GTK+. Similar to diff --git a/pkgs/development/libraries/gtkmathview/default.nix b/pkgs/development/libraries/gtkmathview/default.nix index 2620d9cc120..8a6914cfcd3 100644 --- a/pkgs/development/libraries/gtkmathview/default.nix +++ b/pkgs/development/libraries/gtkmathview/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = http://helm.cs.unibo.it/mml-widget/; - description = "GtkMathView is a C++ rendering engine for MathML documents"; + description = "C++ rendering engine for MathML documents"; license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index bae0639a61c..e278980e1e1 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gupnp.org/; - description = "GUPnP is an implementation of the UPnP specification."; + description = "An implementation of the UPnP specification"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 8340660e392..45cdc5be02b 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -8,11 +8,11 @@ # (icu is a ~30 MB dependency, the rest is very small in comparison) stdenv.mkDerivation rec { - name = "harfbuzz-0.9.33"; + name = "harfbuzz-0.9.35"; src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2"; - sha256 = "1iql2ghlndqgx9q6p098xf253rjz5rnrv5qniwgd1b5q0jzwa4yk"; + sha256 = "1v86596994bnb9hx7laykhw4ipixqz9ckwzyyqf340pmlsmsi88a"; }; configureFlags = [ diff --git a/pkgs/development/libraries/haskell/GLUtil/default.nix b/pkgs/development/libraries/haskell/GLUtil/default.nix index ce4b41c93e0..ee99ccc4fee 100644 --- a/pkgs/development/libraries/haskell/GLUtil/default.nix +++ b/pkgs/development/libraries/haskell/GLUtil/default.nix @@ -1,15 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, cpphs, JuicyPixels, linear, OpenGL, OpenGLRaw +{ cabal, cpphs, filepath, JuicyPixels, linear, OpenGL, OpenGLRaw , transformers, vector }: cabal.mkDerivation (self: { pname = "GLUtil"; - version = "0.8"; - sha256 = "00r9gmwsb9gx6bcc012rhz0z0hj3my8k1i0yjnaw0jmlqswm45h8"; + version = "0.8.1"; + sha256 = "026w6rsgs0vmjx9fj4x3r93rifdyjygb83spcwmch31a7qng6l7w"; buildDepends = [ - cpphs JuicyPixels linear OpenGL OpenGLRaw transformers vector + cpphs filepath JuicyPixels linear OpenGL OpenGLRaw transformers + vector ]; buildTools = [ cpphs ]; meta = { diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.17.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.18.nix index ce90b9a9426..0a5a16dfadc 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.17.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.18.nix @@ -1,19 +1,19 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, caseInsensitive, conduit, conduitExtra, deepseq, httpdShed -, httpTypes, HUnit, mtl, network, parsec, pureMD5, split -, testFramework, testFrameworkHunit, wai, warp +, httpTypes, HUnit, mtl, network, networkUri, parsec, pureMD5 +, split, testFramework, testFrameworkHunit, wai, warp }: cabal.mkDerivation (self: { pname = "HTTP"; - version = "4000.2.17"; - sha256 = "1701mgf1gw00nxd70kkr86yl80qxy63rpqky2g9m2nfr6y4y5b59"; - buildDepends = [ mtl network parsec ]; + version = "4000.2.18"; + sha256 = "1jn0ikbdwhd32qjwpnsmpnmy0dxhmwfhf8851ifxik91fn7j5j4k"; + buildDepends = [ mtl network networkUri parsec ]; testDepends = [ caseInsensitive conduit conduitExtra deepseq httpdShed httpTypes - HUnit mtl network pureMD5 split testFramework testFrameworkHunit - wai warp + HUnit mtl network networkUri pureMD5 split testFramework + testFrameworkHunit wai warp ]; doCheck = false; noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11"; diff --git a/pkgs/development/libraries/haskell/MonadRandom/default.nix b/pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix index fb2415fd6fa..0cbd926b1f1 100644 --- a/pkgs/development/libraries/haskell/MonadRandom/default.nix +++ b/pkgs/development/libraries/haskell/MonadRandom/0.1.13.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.2.0.1.nix b/pkgs/development/libraries/haskell/MonadRandom/0.2.0.1.nix new file mode 100644 index 00000000000..cc430e22090 --- /dev/null +++ b/pkgs/development/libraries/haskell/MonadRandom/0.2.0.1.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, mtl, random, transformers }: + +cabal.mkDerivation (self: { + pname = "MonadRandom"; + version = "0.2.0.1"; + sha256 = "1689302z053zhcr46w5q3a57kd6z365kkgzxh638gcakzzk3pmwm"; + buildDepends = [ mtl random transformers ]; + meta = { + description = "Random-number generation monad"; + license = "unknown"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/auto-update/default.nix b/pkgs/development/libraries/haskell/auto-update/default.nix index b7c314f9ff9..e047e938dae 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.1"; - sha256 = "0ksclbh3d7p2511ji86ind8f6jrh58mz61mc441kfz51ippkdk59"; + version = "0.1.1.2"; + sha256 = "0901zqky70wyxl17vwz6smhnpsfjnsk0f2xqiyz902vl7apx66c6"; testDepends = [ hspec ]; meta = { homepage = "https://github.com/yesodweb/wai"; diff --git a/pkgs/development/libraries/haskell/aws/default.nix b/pkgs/development/libraries/haskell/aws/default.nix index d6e8a5fb5ad..3df47d95618 100644 --- a/pkgs/development/libraries/haskell/aws/default.nix +++ b/pkgs/development/libraries/haskell/aws/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "aws"; - version = "0.10.2"; - sha256 = "15yr06z54wxnl37a94515ajlxrb7z9kii5dd0ssan32izh4nfrl2"; + version = "0.10.3"; + sha256 = "042vx5nhafvgw0crymkw8pyhiawhpxwj03n1k538y2wr181hmz5f"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/cabal-cargs/default.nix b/pkgs/development/libraries/haskell/cabal-cargs/default.nix index 85015f5d4ac..a74e54f7e43 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"; - sha256 = "1dzmvwmb9sxwdgkzszhk9d5qvq2alnqmprx83dlb17sdi6f9jns1"; + version = "0.7.1"; + sha256 = "0y6v663mw4giwypdv34qr2l2fy1q7zdjvgw39m16sjna5lbwvm1n"; 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 a4ac5164e1f..b5427b3b747 100644 --- a/pkgs/development/libraries/haskell/cabal-lenses/default.nix +++ b/pkgs/development/libraries/haskell/cabal-lenses/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cabal-lenses"; - version = "0.3"; - sha256 = "13nx9cn81cx9cj7fk07akqvz4qkl49dlgb5wl5wanag6bafa6vhl"; + version = "0.3.1"; + sha256 = "17piwqyzd33shp12qa6j4s579rrs34l44x19p2nzz69anhc4g1j7"; buildDepends = [ Cabal lens unorderedContainers ]; meta = { description = "Lenses and traversals for the Cabal library"; diff --git a/pkgs/development/libraries/haskell/compdata/default.nix b/pkgs/development/libraries/haskell/compdata/default.nix index 2e26d9ac781..ecaec5c4dd0 100644 --- a/pkgs/development/libraries/haskell/compdata/default.nix +++ b/pkgs/development/libraries/haskell/compdata/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "compdata"; - version = "0.8.1.3"; - sha256 = "0rnvw5bdypl6i2k1wnc727a17hapl4hs7n208h16ngk075841gpb"; + version = "0.9"; + sha256 = "1wk9vj834l3fc64fcsrgc9hz5f2z7461hs8lv1ldkfsixx4mxyqc"; buildDepends = [ deepseq derive mtl QuickCheck thExpandSyns transformers treeView ]; diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix index c0f678311b9..3a695fa8203 100644 --- a/pkgs/development/libraries/haskell/diagrams/cairo.nix +++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix @@ -7,18 +7,18 @@ cabal.mkDerivation (self: { pname = "diagrams-cairo"; - version = "1.2"; - sha256 = "0vzjp1i5hk971r7f55gpdl0jibrjg9j4ny7p408kb8zl2ynlxv6l"; + version = "1.2.0.1"; + sha256 = "0y7llxxs34i814nc3c79ykv75znplzqq7njvq7a5fyxl81ji0z4c"; buildDepends = [ cairo colour dataDefaultClass diagramsCore diagramsLib filepath hashable JuicyPixels lens mtl optparseApplicative pango split statestack time transformers vector ]; - jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams"; description = "Cairo backend for diagrams drawing EDSL"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ bergey ]; }; }) diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix index 2dcc86d5c9b..f1044870f3a 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"; - sha256 = "1gljmzlhc6vck5lcsq9lhf2k4dik5pp62k85y2kkxgq0mxnmqf0g"; + version = "1.1.2.1"; + sha256 = "05jsqc9wm87hpnaclzfa376m5z8lnp4qgll6lqnfa5m49cqcabki"; buildDepends = [ arithmoi circlePacking colour dataDefault dataDefaultClass diagramsCore diagramsLib forceLayout lens MonadRandom mtl parsec @@ -20,11 +20,11 @@ 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"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ bergey ]; }; }) diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix index 9a1245d04d0..18f362e0c21 100644 --- a/pkgs/development/libraries/haskell/diagrams/core.nix +++ b/pkgs/development/libraries/haskell/diagrams/core.nix @@ -6,17 +6,17 @@ cabal.mkDerivation (self: { pname = "diagrams-core"; - version = "1.2.0.1"; - sha256 = "01rzd2zdg0pv7b299z6s6i6l6xggiszb2qs00vh5dbss295n1sps"; + version = "1.2.0.2"; + sha256 = "10glkp05pnxx7c7f33654rjcvahslxx010v36wf6zsa8nscdrccn"; buildDepends = [ dualTree lens MemoTrie monoidExtras newtype semigroups vectorSpace vectorSpacePoints ]; - jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams"; description = "Core libraries for diagrams EDSL"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ bergey ]; }; }) diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index 77047d98291..b15f05dbf27 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -8,19 +8,19 @@ cabal.mkDerivation (self: { pname = "diagrams-lib"; - version = "1.2.0.1"; - sha256 = "0p7rq97hnal90dciq1nln1s16kdb1xk9rrwaxhkxqr6kjjr2njf4"; + version = "1.2.0.2"; + sha256 = "0ylrsldq7nmqvprgwbw7bkwp31zhgbyxjx462lcayk0lbhqb5k5p"; buildDepends = [ active colour dataDefaultClass diagramsCore dualTree filepath fingertree hashable intervals JuicyPixels lens MemoTrie monoidExtras optparseApplicative safe semigroups tagged vectorSpace vectorSpacePoints ]; - jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative graphics"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ bergey ]; }; }) diff --git a/pkgs/development/libraries/haskell/diagrams/postscript.nix b/pkgs/development/libraries/haskell/diagrams/postscript.nix index 6ecd2dd4a41..557aae73db5 100644 --- a/pkgs/development/libraries/haskell/diagrams/postscript.nix +++ b/pkgs/development/libraries/haskell/diagrams/postscript.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "diagrams-postscript"; - version = "1.1"; - sha256 = "0l077libp6h8ka9ygkmajvzdymndlhx60nb5f6jaqvp7yx80hz3m"; + version = "1.1.0.1"; + sha256 = "03747g5y33kzf76hs4y0ak9q6b79r92z130b03bcc2892na62ad6"; buildDepends = [ dataDefaultClass diagramsCore diagramsLib dlist filepath hashable lens monoidExtras mtl semigroups split vectorSpace @@ -18,7 +18,6 @@ cabal.mkDerivation (self: { description = "Postscript backend for diagrams drawing EDSL"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; + maintainers = with self.stdenv.lib.maintainers; [ bergey ]; }; }) diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix index f982f427863..8393d7c6f98 100644 --- a/pkgs/development/libraries/haskell/diagrams/svg.nix +++ b/pkgs/development/libraries/haskell/diagrams/svg.nix @@ -7,18 +7,18 @@ cabal.mkDerivation (self: { pname = "diagrams-svg"; - version = "1.1"; - sha256 = "0b34rh35pay4x8dg0i06xvr3d865hbxzj2x77jly9l1j7sa1qaj1"; + version = "1.1.0.1"; + sha256 = "02krwy1v7rhcgg0ps7kd8ym50kh48dcfqm2xz3k6hr32jzqa5hlw"; 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"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ bergey ]; }; }) diff --git a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix index 924f8bb351d..1958307e869 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix @@ -1,18 +1,19 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, digestiveFunctors, HUnit, lens, mtl, safe -, scientific, tasty, tastyHunit, text, vector +{ cabal, aeson, digestiveFunctors, HUnit, lens, lensAeson, mtl +, safe, scientific, tasty, tastyHunit, text, vector }: cabal.mkDerivation (self: { pname = "digestive-functors-aeson"; - version = "1.1.10"; - sha256 = "0ar165rksnj09sb58qx5hm71kn8gzm936ixmfhf7sqbw2kcbw4nx"; - buildDepends = [ aeson digestiveFunctors lens safe text vector ]; + version = "1.1.11"; + sha256 = "0jf62ssyc317x070xkjdnfbb2g8mb19a83hig08j95vyqwjgk4vg"; + buildDepends = [ + aeson digestiveFunctors lens lensAeson safe text vector + ]; testDepends = [ aeson digestiveFunctors HUnit mtl scientific tasty tastyHunit text ]; - jailbreak = true; meta = { homepage = "http://github.com/ocharles/digestive-functors-aeson"; description = "Run digestive-functors forms against JSON"; diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix index 113e1af46ee..ab74819965a 100644 --- a/pkgs/development/libraries/haskell/dns/default.nix +++ b/pkgs/development/libraries/haskell/dns/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "dns"; - version = "1.4.3"; - sha256 = "15v24f338w71dn3cxrzwyg04hk3vxvrvswbv3nnf2ggjgg46yq3i"; + version = "1.4.4"; + sha256 = "1g910rlahvrhjlg6jl7gpya1y3mqkkpmihfr2jnmmlzykll10dnd"; buildDepends = [ attoparsec binary blazeBuilder conduit conduitExtra iproute mtl network random resourcet @@ -21,5 +21,6 @@ cabal.mkDerivation (self: { description = "DNS library in Haskell"; 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/engine-io/default.nix b/pkgs/development/libraries/haskell/engine-io/default.nix index 82cb1240610..f1f9d06c76a 100644 --- a/pkgs/development/libraries/haskell/engine-io/default.nix +++ b/pkgs/development/libraries/haskell/engine-io/default.nix @@ -7,13 +7,12 @@ cabal.mkDerivation (self: { pname = "engine-io"; - version = "1.1.0"; - sha256 = "0l2jwgzi22ky13k9kmqhn15zyxyg5gr167rkywb458n1si4jr3jh"; + version = "1.1.2"; + sha256 = "1ry6rklrij7x1z8mw31vh41lc0axzj8l0lhmjsmhs554nv50062f"; buildDepends = [ aeson async attoparsec base64Bytestring either monadLoops mwcRandom stm text transformers unorderedContainers vector websockets ]; - jailbreak = true; meta = { homepage = "http://github.com/ocharles/engine.io"; description = "A Haskell implementation of Engine.IO"; diff --git a/pkgs/development/libraries/haskell/equational-reasoning/default.nix b/pkgs/development/libraries/haskell/equational-reasoning/default.nix new file mode 100644 index 00000000000..fa88fbfe2e8 --- /dev/null +++ b/pkgs/development/libraries/haskell/equational-reasoning/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, singletons, tagged, void }: + +cabal.mkDerivation (self: { + pname = "equational-reasoning"; + version = "0.2.0.4"; + sha256 = "1f94y6h7qg7rck7rxf6j8sygkh1xmfk0z1lr71inx6s74agjyc9j"; + buildDepends = [ singletons tagged void ]; + meta = { + description = "Proof assistant for Haskell using DataKinds & PolyKinds"; + 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/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix index 77259cc1e40..09a22c0ac60 100644 --- a/pkgs/development/libraries/haskell/force-layout/default.nix +++ b/pkgs/development/libraries/haskell/force-layout/default.nix @@ -4,15 +4,15 @@ cabal.mkDerivation (self: { pname = "force-layout"; - version = "0.3.0.6"; - sha256 = "0qmzz9gbzf1jdk08w3nhnw7l3n5bq5sw5k4r0mdc5y11m38xpgm4"; + version = "0.3.0.7"; + sha256 = "1kq6fg90yj735rpipspykvkmzs2cnwyib6pkph58523bvahgi2dy"; buildDepends = [ dataDefaultClass lens vectorSpace vectorSpacePoints ]; - jailbreak = true; meta = { description = "Simple force-directed layout"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ bergey ]; }; }) diff --git a/pkgs/development/libraries/haskell/free-game/default.nix b/pkgs/development/libraries/haskell/free-game/default.nix index d2a0f33892f..ee47e6bb3f5 100644 --- a/pkgs/development/libraries/haskell/free-game/default.nix +++ b/pkgs/development/libraries/haskell/free-game/default.nix @@ -21,5 +21,6 @@ cabal.mkDerivation (self: { description = "Create games for free"; 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/ghc-mod/5.0.1.nix b/pkgs/development/libraries/haskell/ghc-mod/5.0.1.1.nix index ad920721451..3eefe056218 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/5.0.1.1.nix @@ -2,14 +2,14 @@ { cabal, Cabal, convertible, deepseq, djinnGhc, doctest, emacs , filepath, ghcPaths, ghcSybUtils, haskellSrcExts, hlint, hspec -, ioChoice, monadControl, monadJournal, mtl, split, syb, text, time -, transformers, transformersBase +, ioChoice, makeWrapper, monadControl, monadJournal, mtl, split +, syb, text, time, transformers, transformersBase }: cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "5.0.1"; - sha256 = "01awsi5rfzq6433shfvvnr69ifxb7h8v90mlknxv3dl34zmrhv19"; + version = "5.0.1.1"; + sha256 = "0qyl1653dj14ap3035kjj7xl8rsmgpwh32bj2lnwrmdm2223m8a3"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -22,7 +22,7 @@ cabal.mkDerivation (self: { ghcSybUtils haskellSrcExts hlint hspec ioChoice monadControl monadJournal mtl split syb text time transformers transformersBase ]; - buildTools = [ emacs ]; + buildTools = [ emacs makeWrapper ]; doCheck = false; configureFlags = "--datasubdir=${self.pname}-${self.version}"; postInstall = '' @@ -32,20 +32,10 @@ cabal.mkDerivation (self: { cd .. ensureDir "$out/share/emacs" mv $pname-$version emacs/site-lisp - mv $out/bin/ghc-mod $out/bin/.ghc-mod-wrapped - cat - > $out/bin/ghc-mod <<EOF - #! ${self.stdenv.shell} - eval exec $out/bin/.ghc-mod-wrapped \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@" - EOF - - mv $out/bin/ghc-modi $out/bin/.ghc-modi-wrapped - cat - > $out/bin/ghc-modi <<EOF - #! ${self.stdenv.shell} - eval exec $out/bin/.ghc-modi-wrapped \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@" - EOF - - chmod +x $out/bin/ghc-mod - chmod +x $out/bin/ghc-modi + wrapProgram $out/bin/ghc-mod --add-flags \ + "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"-g -package-db -g\")" + wrapProgram $out/bin/ghc-modi --add-flags \ + "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"-g -package-db -g\")" ''; meta = { homepage = "http://www.mew.org/~kazu/proj/ghc-mod/"; diff --git a/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix b/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix index 7778d3f8e5a..0c7d5c82f11 100644 --- a/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix +++ b/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghc-syb-utils"; - version = "0.2.1.2"; - sha256 = "12k6a782gv06gmi6dvskzv4ihz54izhqslwa9cgilhsihw557i9p"; + version = "0.2.2"; + sha256 = "03r4x3a4hjivxladlw23jk8s2pgfh85lqf196ks1ngyg6ih1g6lk"; buildDepends = [ syb ]; meta = { homepage = "http://github.com/nominolo/ghc-syb"; diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix index b35055b7719..f20976b8dcf 100644 --- a/pkgs/development/libraries/haskell/github/default.nix +++ b/pkgs/development/libraries/haskell/github/default.nix @@ -7,18 +7,18 @@ cabal.mkDerivation (self: { pname = "github"; - version = "0.10.0"; - sha256 = "1llwzkhyw5wazczpiv3w8dq4l7j3q49ii64yh7cxwakkp2h5yiwb"; + version = "0.11.0"; + sha256 = "13p0iplxr85fvgx5lird76xchmhh7xpddq900qr02kbvn5mqv607"; buildDepends = [ aeson attoparsec caseInsensitive conduit dataDefault failure hashable HTTP httpConduit httpTypes network text time unorderedContainers vector ]; - jailbreak = true; meta = { homepage = "https://github.com/fpco/github"; description = "Access to the Github API, v3"; 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/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index 44a04cc5380..0e0f147bab9 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -1,23 +1,26 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, base64Bytestring, blazeHtml, ConfigFile, feed, filepath -, filestore, ghcPaths, happstackServer, highlightingKate, hslogger -, HStringTemplate, HTTP, json, mtl, network, pandoc, pandocTypes -, parsec, random, recaptcha, safe, SHA, split, syb, tagsoup, text -, time, uri, url, utf8String, xhtml, xml, xssSanitize, zlib +{ 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 }: cabal.mkDerivation (self: { pname = "gitit"; - version = "0.10.4"; - sha256 = "1z06v1pamrpm70zisrw3z3kv0d19dsjkmm75pvj5yxkacxv7qk7n"; + version = "0.10.5"; + sha256 = "0p2x2l729rwals0kx8ymk6j3fqvlyjvrj6mmh8slcg93h4smwb4j"; isLibrary = true; isExecutable = true; buildDepends = [ - base64Bytestring blazeHtml ConfigFile feed filepath filestore - ghcPaths happstackServer highlightingKate hslogger HStringTemplate - HTTP json mtl network pandoc pandocTypes parsec random recaptcha - safe SHA split syb tagsoup text time uri url utf8String xhtml xml + 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 ]; jailbreak = true; @@ -26,7 +29,5 @@ cabal.mkDerivation (self: { description = "Wiki using happstack, git or darcs, and pandoc"; license = "GPL"; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 1bb23f07bdb..e38eadad057 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -5,13 +5,13 @@ , HUnit, lrucache, mtl, network, pandoc, pandocCiteproc, parsec , QuickCheck, random, regexBase, regexTdfa, snapCore, snapServer , systemFilepath, tagsoup, testFramework, testFrameworkHunit -, testFrameworkQuickcheck2, text, time +, testFrameworkQuickcheck2, text, time, utillinux }: cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.5.3.0"; - sha256 = "11ibpjff1zkihpxydlzvvzbgd1vxswi4c7g3lr0hhaaw89bikypy"; + version = "4.5.4.0"; + sha256 = "16srkm2fxjw1xg7zaikn49zz4xsz9awddnjm6ibv522k3xf3l24c"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -25,15 +25,13 @@ cabal.mkDerivation (self: { filepath fsnotify httpConduit httpTypes HUnit lrucache mtl network pandoc pandocCiteproc parsec QuickCheck random regexBase regexTdfa snapCore snapServer systemFilepath tagsoup testFramework - testFrameworkHunit testFrameworkQuickcheck2 text time + testFrameworkHunit testFrameworkQuickcheck2 text time utillinux ]; - doCheck = false; meta = { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; }; }) diff --git a/pkgs/development/libraries/haskell/hcltest/default.nix b/pkgs/development/libraries/haskell/hcltest/default.nix index af598965498..01f683b5568 100644 --- a/pkgs/development/libraries/haskell/hcltest/default.nix +++ b/pkgs/development/libraries/haskell/hcltest/default.nix @@ -20,5 +20,7 @@ cabal.mkDerivation (self: { 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/hdaemonize/default.nix b/pkgs/development/libraries/haskell/hdaemonize/default.nix index e342773775d..1fdca2c4f9a 100644 --- a/pkgs/development/libraries/haskell/hdaemonize/default.nix +++ b/pkgs/development/libraries/haskell/hdaemonize/default.nix @@ -12,5 +12,6 @@ cabal.mkDerivation (self: { description = "Library to handle the details of writing daemons for UNIX"; 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/hi/default.nix b/pkgs/development/libraries/haskell/hi/default.nix index ba161493109..0384325c2d7 100644 --- a/pkgs/development/libraries/haskell/hi/default.nix +++ b/pkgs/development/libraries/haskell/hi/default.nix @@ -1,21 +1,23 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, filepath, hspec, HUnit, parsec, split, template +{ cabal, doctest, filepath, hspec, HUnit, parsec, split, template , temporaryRc, text, time }: cabal.mkDerivation (self: { pname = "hi"; - version = "0.0.8.1"; - sha256 = "14g1yfc6cv89whx6w0di5nayifc0xfvll9h07kkqxaajyfw6s32y"; + version = "0.0.8.2"; + sha256 = "0h94wjxdr6g6n3rvkn1xsjqr49p9fgidmraifvz5mzryn6rmd18r"; isLibrary = true; isExecutable = true; buildDepends = [ filepath parsec split template temporaryRc text time ]; testDepends = [ - filepath hspec HUnit parsec split template temporaryRc text time + doctest filepath hspec HUnit parsec split template temporaryRc text + time ]; + doCheck = false; meta = { homepage = "https://github.com/fujimura/hi"; description = "Generate scaffold for cabal project"; diff --git a/pkgs/development/libraries/haskell/hplayground/default.nix b/pkgs/development/libraries/haskell/hplayground/default.nix index b12024f5945..db38dbc2399 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.2"; - sha256 = "13lzw0fhv305zh2ry0d74y5k7vxppjlwsb8vi3iri5zpkkdpfhij"; + version = "0.1.0.3"; + sha256 = "1k46b94n9wkbh7374mjyg5jnwxxrhj8ai53q3r4lysx1rzgw7ak6"; buildDepends = [ dataDefault hasteCompiler hastePerch monadsTf transformers ]; diff --git a/pkgs/development/libraries/haskell/hsimport/default.nix b/pkgs/development/libraries/haskell/hsimport/default.nix index 8f080fe6e25..96bcecddc30 100644 --- a/pkgs/development/libraries/haskell/hsimport/default.nix +++ b/pkgs/development/libraries/haskell/hsimport/default.nix @@ -6,15 +6,14 @@ cabal.mkDerivation (self: { pname = "hsimport"; - version = "0.5"; - sha256 = "18rhldw6vbkjcpx373m784sppadccm2b3xx3zzr0l45dwmsh6rb4"; + version = "0.5.1"; + sha256 = "17yzfikfl8qvm6vp3d472l6p0kzzw694ng19xn3fmrb43qvki4jj"; isLibrary = true; isExecutable = true; buildDepends = [ attoparsec cmdargs dyre haskellSrcExts lens mtl split text ]; testDepends = [ filepath haskellSrcExts tasty tastyGolden ]; - doCheck = false; meta = { description = "A command line program for extending the import list of a Haskell source file"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/hspec-wai/default.nix b/pkgs/development/libraries/haskell/hspec-wai/default.nix index 3170318f540..1341bf198c9 100644 --- a/pkgs/development/libraries/haskell/hspec-wai/default.nix +++ b/pkgs/development/libraries/haskell/hspec-wai/default.nix @@ -21,5 +21,6 @@ cabal.mkDerivation (self: { description = "Experimental Hspec support for testing WAI applications (depends on hspec2!)"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/hspec2/default.nix b/pkgs/development/libraries/haskell/hspec2/default.nix index 9b57dbd7627..295b01b4e32 100644 --- a/pkgs/development/libraries/haskell/hspec2/default.nix +++ b/pkgs/development/libraries/haskell/hspec2/default.nix @@ -25,5 +25,7 @@ cabal.mkDerivation (self: { description = "Alpha version of Hspec 2.0"; 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/hsyslog/default.nix b/pkgs/development/libraries/haskell/hsyslog/default.nix index 1a5cbd5b8e6..89bd035eaf1 100644 --- a/pkgs/development/libraries/haskell/hsyslog/default.nix +++ b/pkgs/development/libraries/haskell/hsyslog/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { version = "2.0"; sha256 = "02v698grn43bvikqhqiz9ys8x2amngdmhvl3i0ar9203p2x8q3pq"; testDepends = [ doctest ]; + noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11"; meta = { homepage = "http://github.com/peti/hsyslog"; description = "FFI interface to syslog(3) from POSIX.1-2001"; diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix index 2c3ad6d1141..7f032c3f675 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.7.1"; - sha256 = "0wfmzpjzazk5jr1pbkhkxxa32pd40mgm1p426k5bxjn3gw48r30c"; + version = "0.3.7.2"; + sha256 = "1llrf2bfbh5z01pwg40zdgmz93h45h60mg2pv1k6b8pmzlwr6aaz"; 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 132b9722f74..fd7eb7dd64a 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "2.1.4"; - sha256 = "14xfd25y7r2lhg7dx9hfniihgyzhkz4c6642k5pr27fqjjlr6ijb"; + version = "2.1.4.1"; + sha256 = "1v65v2dky7vgyh5hfvih208zhbd2czxdrshw9zw0af1naq2m5hk2"; buildDepends = [ conduit httpClient httpClientTls httpTypes liftedBase monadControl mtl resourcet transformers diff --git a/pkgs/development/libraries/haskell/hweblib/default.nix b/pkgs/development/libraries/haskell/hweblib/default.nix index 1ce64baa09c..1d7d17085dc 100644 --- a/pkgs/development/libraries/haskell/hweblib/default.nix +++ b/pkgs/development/libraries/haskell/hweblib/default.nix @@ -13,5 +13,6 @@ cabal.mkDerivation (self: { description = "Haskell Web Library"; 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/ivory/default.nix b/pkgs/development/libraries/haskell/ivory/default.nix new file mode 100644 index 00000000000..3e3c6c78ae1 --- /dev/null +++ b/pkgs/development/libraries/haskell/ivory/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, monadLib, parsec, thLift }: + +cabal.mkDerivation (self: { + pname = "ivory"; + version = "0.1.0.0"; + sha256 = "1rn1akrsci0k5nbk4zipxznkdm0y3rvv9la5mnrr9mkj5zikj5sc"; + buildDepends = [ monadLib parsec thLift ]; + meta = { + homepage = "http://smaccmpilot.org/languages/ivory-introduction.html"; + description = "Safe embedded C programming"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + broken = self.stdenv.lib.versionOlder "7.7" self.ghc.version; + }; +}) diff --git a/pkgs/development/libraries/haskell/json-assertions/default.nix b/pkgs/development/libraries/haskell/json-assertions/default.nix index fce4d5d7922..9adcaf17572 100644 --- a/pkgs/development/libraries/haskell/json-assertions/default.nix +++ b/pkgs/development/libraries/haskell/json-assertions/default.nix @@ -1,12 +1,12 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, indexed, indexedFree, lens, text }: +{ cabal, aeson, indexed, indexedFree, lens, lensAeson, text }: cabal.mkDerivation (self: { pname = "json-assertions"; - version = "1.0.4"; - sha256 = "07qjbbwmph75s8ds1yfy17ww7x2wcc9bpjpv2bq9ggmzllf6g8l5"; - buildDepends = [ aeson indexed indexedFree lens text ]; + version = "1.0.5"; + sha256 = "1vf6y8xbl48giq1p6d62294rfvfdw62l1q4dspy990ii0v5gkyck"; + buildDepends = [ aeson indexed indexedFree lens lensAeson text ]; 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-schema/default.nix b/pkgs/development/libraries/haskell/json-schema/default.nix index 4eb40764673..8ae6763d0a4 100644 --- a/pkgs/development/libraries/haskell/json-schema/default.nix +++ b/pkgs/development/libraries/haskell/json-schema/default.nix @@ -17,6 +17,7 @@ cabal.mkDerivation (self: { aeson attoparsec genericAeson HUnit tagged tasty tastyHunit tastyTh text ]; + jailbreak = true; meta = { description = "Types and type classes for defining JSON schemas"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/language-c/default.nix b/pkgs/development/libraries/haskell/language-c/default.nix index 6562d3fdf26..2fe11c4f071 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.5"; - sha256 = "0q0x1rm74g27ry4jja44hk8z0lqkwnimnxbcy54m2cphaxk7yjk4"; + version = "0.4.6"; + sha256 = "0pzd3g5q3sjfngs29biannza6l9am75kcjy5q0xcjv7xhz0z1m31"; buildDepends = [ filepath syb ]; buildTools = [ alex happy ]; meta = { diff --git a/pkgs/development/libraries/haskell/lens-aeson/default.nix b/pkgs/development/libraries/haskell/lens-aeson/default.nix new file mode 100644 index 00000000000..d19b0bf6dd7 --- /dev/null +++ b/pkgs/development/libraries/haskell/lens-aeson/default.nix @@ -0,0 +1,24 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, attoparsec, doctest, filepath, genericDeriving +, lens, scientific, semigroups, simpleReflect, text +, unorderedContainers, vector +}: + +cabal.mkDerivation (self: { + pname = "lens-aeson"; + version = "1"; + sha256 = "0zpfpba97kr92lzrmdfk08f3cl42alhx0d73w8sbbwxnnvv4489r"; + buildDepends = [ + aeson attoparsec lens scientific text unorderedContainers vector + ]; + testDepends = [ + doctest filepath genericDeriving semigroups simpleReflect + ]; + meta = { + homepage = "http://github.com/lens/lens-aeson/"; + description = "Law-abiding lenses for aeson"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index 655525e4d59..190dd3fd14e 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -1,25 +1,23 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, attoparsec, bifunctors, comonad, contravariant -, deepseq, distributive, doctest, exceptions, filepath, free -, genericDeriving, hashable, hlint, HUnit, mtl, nats, parallel -, primitive, profunctors, QuickCheck, reflection, scientific -, semigroupoids, semigroups, simpleReflect, split, tagged -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 -, testFrameworkTh, text, transformers, transformersCompat -, unorderedContainers, vector, void, zlib +{ cabal, bifunctors, comonad, contravariant, deepseq, distributive +, doctest, exceptions, filepath, free, genericDeriving, hashable +, hlint, HUnit, mtl, nats, parallel, primitive, profunctors +, QuickCheck, reflection, semigroupoids, semigroups, simpleReflect +, split, tagged, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, testFrameworkTh, text, transformers +, transformersCompat, unorderedContainers, vector, void, zlib }: cabal.mkDerivation (self: { pname = "lens"; - version = "4.3.3"; - sha256 = "0k7qslnh15xnrj86wwsp0mvz6g363ma4g0dxkmvvg4sa1bxljr1f"; + version = "4.4.0.1"; + sha256 = "0d1z6jix58g7x9r1jvm335hg2psflqc7w6sq54q486wil55c5vrw"; buildDepends = [ - aeson attoparsec bifunctors comonad contravariant distributive - exceptions filepath free hashable mtl parallel primitive - profunctors reflection scientific semigroupoids semigroups split - tagged text transformers transformersCompat unorderedContainers - vector void zlib + bifunctors comonad contravariant distributive exceptions filepath + free hashable mtl parallel primitive profunctors reflection + semigroupoids semigroups split tagged text transformers + transformersCompat unorderedContainers vector void zlib ]; testDepends = [ deepseq doctest filepath genericDeriving hlint HUnit mtl nats @@ -27,7 +25,6 @@ cabal.mkDerivation (self: { testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh text transformers unorderedContainers vector ]; - doCheck = false; meta = { homepage = "http://github.com/ekmett/lens/"; description = "Lenses, Folds and Traversals"; diff --git a/pkgs/development/libraries/haskell/lifted-async/default.nix b/pkgs/development/libraries/haskell/lifted-async/default.nix index 04c589b5479..97a252d13d5 100644 --- a/pkgs/development/libraries/haskell/lifted-async/default.nix +++ b/pkgs/development/libraries/haskell/lifted-async/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "lifted-async"; - version = "0.2.0.1"; - sha256 = "1x3qdgy0jkqx71xndjh769lw3wrwq63k2kc33pxn6x11yyklcf1j"; + version = "0.2.0.2"; + sha256 = "07sqgd3lxplfwrpys4jhz0068sx99765lpx8n4nj3k117z32slgf"; buildDepends = [ async liftedBase monadControl transformersBase ]; testDepends = [ async HUnit liftedBase monadControl mtl tasty tastyHunit tastyTh diff --git a/pkgs/development/libraries/haskell/markdown/default.nix b/pkgs/development/libraries/haskell/markdown/default.nix new file mode 100644 index 00000000000..746bd1c7484 --- /dev/null +++ b/pkgs/development/libraries/haskell/markdown/default.nix @@ -0,0 +1,27 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, attoparsec, blazeHtml, conduit, conduitExtra, dataDefault +, hspec, systemFileio, systemFilepath, text, transformers +, xssSanitize +}: + +cabal.mkDerivation (self: { + pname = "markdown"; + version = "0.1.9"; + sha256 = "1bl86alrbl9i690sbqqlxb4hkdd0lv3x5aqc8zi55q9h0rfsi06l"; + buildDepends = [ + attoparsec blazeHtml conduit conduitExtra dataDefault text + transformers xssSanitize + ]; + testDepends = [ + blazeHtml conduit conduitExtra hspec systemFileio systemFilepath + text transformers + ]; + meta = { + homepage = "https://github.com/snoyberg/markdown"; + description = "Convert Markdown to HTML, with XSS protection"; + 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/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix index cb3a13f8c6e..d8e724259a0 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.1"; - sha256 = "0imr1bgcpfm19a91r4i6lii7gycx77ysfrdri030zr2jjrvggh9i"; + version = "0.3.7.2"; + sha256 = "03q8l28rwrg00c2zcv0gr5fpis5xz8c5zspziay6p2grbwfxmwda"; buildDepends = [ blazeBuilder conduit conduitExtra exceptions fastLogger liftedBase monadControl monadLoops mtl resourcet stm stmChans text diff --git a/pkgs/development/libraries/haskell/monomorphic/default.nix b/pkgs/development/libraries/haskell/monomorphic/default.nix new file mode 100644 index 00000000000..e160878b680 --- /dev/null +++ b/pkgs/development/libraries/haskell/monomorphic/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "monomorphic"; + version = "0.0.3.2"; + sha256 = "13zw506wifz2lf7n4a48rkn7ym44jpiqag21zc1py6xxdlkbrhh2"; + meta = { + homepage = "https://github.com/konn/monomorphic"; + description = "Library to convert polymorphic datatypes to/from its monomorphic represetation"; + 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/network-fancy/default.nix b/pkgs/development/libraries/haskell/network-fancy/default.nix new file mode 100644 index 00000000000..8e0cf757834 --- /dev/null +++ b/pkgs/development/libraries/haskell/network-fancy/default.nix @@ -0,0 +1,14 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "network-fancy"; + version = "0.1.5.2"; + sha256 = "039yrrir17sphkzarwl7hncj7fb4x471mh2lvpqixl3a6nij141c"; + meta = { + homepage = "http://github.com/taruti/network-fancy"; + description = "Networking support with a cleaner API"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; + preConfigure = ''substituteInPlace Setup.hs --replace '-> rt' '-> return ()' ''; +}) diff --git a/pkgs/development/libraries/haskell/network/2.5.0.0.nix b/pkgs/development/libraries/haskell/network/2.5.0.0.nix index dd4278a0052..59a338a7907 100644 --- a/pkgs/development/libraries/haskell/network/2.5.0.0.nix +++ b/pkgs/development/libraries/haskell/network/2.5.0.0.nix @@ -17,5 +17,6 @@ cabal.mkDerivation (self: { 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.6.0.1.nix b/pkgs/development/libraries/haskell/network/2.6.0.1.nix new file mode 100644 index 00000000000..d5d302fbd8e --- /dev/null +++ b/pkgs/development/libraries/haskell/network/2.6.0.1.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, HUnit, testFramework, testFrameworkHunit }: + +cabal.mkDerivation (self: { + pname = "network"; + version = "2.6.0.1"; + sha256 = "0qfffsdbvrf9gs8wr9ps7iv5h6drz4vb2ja9rprmc7ypswsacxsq"; + testDepends = [ HUnit testFramework testFrameworkHunit ]; + meta = { + homepage = "https://github.com/haskell/network"; + description = "Low-level networking interface"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/parsers/0.10.3.nix b/pkgs/development/libraries/haskell/parsers/0.10.3.nix deleted file mode 100644 index 1da7380f252..00000000000 --- a/pkgs/development/libraries/haskell/parsers/0.10.3.nix +++ /dev/null @@ -1,22 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, charset, doctest, filepath, parsec, text, transformers -, unorderedContainers -}: - -cabal.mkDerivation (self: { - pname = "parsers"; - version = "0.10.3"; - sha256 = "1s9n59q77h0w1csq7yh945b53847a9hnpvviashgxyi7ahvw7jli"; - buildDepends = [ - charset parsec text transformers unorderedContainers - ]; - testDepends = [ doctest filepath ]; - meta = { - homepage = "http://github.com/ekmett/parsers/"; - description = "Parsing 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/parsers/0.12.1.nix b/pkgs/development/libraries/haskell/parsers/default.nix index 5c49d144a10..5c49d144a10 100644 --- a/pkgs/development/libraries/haskell/parsers/0.12.1.nix +++ b/pkgs/development/libraries/haskell/parsers/default.nix diff --git a/pkgs/development/libraries/haskell/poppler/default.nix b/pkgs/development/libraries/haskell/poppler/default.nix index 327744560ac..28e7e515c2b 100644 --- a/pkgs/development/libraries/haskell/poppler/default.nix +++ b/pkgs/development/libraries/haskell/poppler/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "poppler"; - version = "0.12.3"; - sha256 = "1ny2r1cpsshpg00w6bd0f5mw26xsy99l7dgx2xq8f01zcwdy4nrp"; + version = "0.13"; + sha256 = "1fv0h2ixanzv5vy4l2ln23f9n8ghmgdxzlyx54hh69bwhrcg049s"; buildDepends = [ cairo glib gtk mtl ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc ]; @@ -18,7 +18,5 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.gpl2; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ianwookim ]; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index a3f471fcb4d..0c4fea2da65 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.3.0"; - sha256 = "16i1qzshbscnbjb4rxz5hl1iaxjmsc21878prj5pp33zbm53dlcm"; + version = "0.4.4.0"; + sha256 = "1rx0rcafiicdv4qbf68dbsfqwiayrl7205dm0c5bdjlvszv576r7"; buildDepends = [ aeson attoparsec blazeBuilder blazeTextual hashable postgresqlLibpq scientific text time transformers uuid vector diff --git a/pkgs/development/libraries/haskell/random/1.0.1.1.nix b/pkgs/development/libraries/haskell/random/1.0.1.1.nix index 5a64573a890..031c251fbb7 100644 --- a/pkgs/development/libraries/haskell/random/1.0.1.1.nix +++ b/pkgs/development/libraries/haskell/random/1.0.1.1.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.0.1.3.nix b/pkgs/development/libraries/haskell/random/1.0.1.3.nix new file mode 100644 index 00000000000..26763deb10a --- /dev/null +++ b/pkgs/development/libraries/haskell/random/1.0.1.3.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.0.1.3"; + sha256 = "06mbjx05c54iz5skn4biyjy9sqdr1qi6d33an8wya7sndnpakd21"; + 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/reserve/default.nix b/pkgs/development/libraries/haskell/reserve/default.nix new file mode 100644 index 00000000000..753368e07c7 --- /dev/null +++ b/pkgs/development/libraries/haskell/reserve/default.nix @@ -0,0 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, baseCompat, hspec, httpConduit, httpKit, httpTypes +, network, QuickCheck, warp +}: + +cabal.mkDerivation (self: { + pname = "reserve"; + version = "0.1.0"; + sha256 = "09b570l6hyn0wfd4nb9xpqrpdb97gbaxnbjlz25y6s0pfg5s1yzp"; + isLibrary = false; + isExecutable = true; + buildDepends = [ baseCompat httpKit httpTypes network ]; + testDepends = [ + baseCompat hspec httpConduit httpKit httpTypes network QuickCheck + warp + ]; + meta = { + description = "Reserve reloads web applications"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/rest-core/default.nix b/pkgs/development/libraries/haskell/rest-core/default.nix index 134c39f9f24..53c3ede3ec1 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.31.1"; - sha256 = "1cx1zmy1zr43n9nlrbar828izccpkvrvjkrda03ra9fkcjgd6qy6"; + version = "0.32"; + sha256 = "130kz1gsrbamw8gs4vc0fqfjh1gi7i52xxmj4fg1vl2dr77gf6my"; 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 afa2f612c01..012f6db8bf2 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.14.2"; - sha256 = "1hmf77hs3pp6lf4glh3lbbwfjr029js185v69bk8ycr1c4ib8nbp"; + version = "0.14.2.1"; + sha256 = "1dvcs25ndmzwdann5yq4567zjirirzskf9v31gkrki0im8mi9x14"; buildDepends = [ aeson blazeHtml Cabal codeBuilder fclabels filepath hashable haskellSrcExts hslogger HStringTemplate hxt jsonSchema restCore diff --git a/pkgs/development/libraries/haskell/rest-happstack/default.nix b/pkgs/development/libraries/haskell/rest-happstack/default.nix index 74c5f2a06cb..4c79bc58c06 100644 --- a/pkgs/development/libraries/haskell/rest-happstack/default.nix +++ b/pkgs/development/libraries/haskell/rest-happstack/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "rest-happstack"; - version = "0.2.10"; - sha256 = "1np8y0v6jnk2lw0aqlzb9dn1vlk8cg75xrhkjmm6qh0z90fy3p6z"; + version = "0.2.10.1"; + sha256 = "0p4km3l8n50flj9cnxvjl34pp3msxz2yq4d91r318di8pacrgnxc"; buildDepends = [ happstackServer mtl restCore restGen utf8String ]; meta = { description = "Rest driver for Happstack"; diff --git a/pkgs/development/libraries/haskell/rest-snap/default.nix b/pkgs/development/libraries/haskell/rest-snap/default.nix index 5305c2d113f..8e9bc69eb01 100644 --- a/pkgs/development/libraries/haskell/rest-snap/default.nix +++ b/pkgs/development/libraries/haskell/rest-snap/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "rest-snap"; - version = "0.1.17.12"; - sha256 = "0hhpscdbph34psfn2h1g0znds0cz7ja9byr6bg7jmj0h86plz8al"; + version = "0.1.17.13"; + sha256 = "13c143dzxhfrshn19ylqfmhnxjirixfif8d1fmzagz1v893narkz"; buildDepends = [ caseInsensitive restCore safe snapCore unorderedContainers uriEncode utf8String diff --git a/pkgs/development/libraries/haskell/rest-types/default.nix b/pkgs/development/libraries/haskell/rest-types/default.nix index 157cab5e979..41b8044b593 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.10.1"; - sha256 = "0i4y1s35ybly1nayqj9c2zqwikpxnzjamq24qbhg0lpqr0dpc1rg"; + version = "1.10.2"; + sha256 = "1j8fpv4xdhbf1awy0v9zn9a3sjwl42l6472wczp3wwwcpsi65d9q"; buildDepends = [ aeson genericAeson hxt jsonSchema mtl regular regularXmlpickler restStringmap text uuid diff --git a/pkgs/development/libraries/haskell/rest-wai/default.nix b/pkgs/development/libraries/haskell/rest-wai/default.nix index 7ddb500265b..d23d81da33d 100644 --- a/pkgs/development/libraries/haskell/rest-wai/default.nix +++ b/pkgs/development/libraries/haskell/rest-wai/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "rest-wai"; - version = "0.1.0.2"; - sha256 = "06wnazy0262b2875q4km2xy9zz7l681vlfj3ny1ha9valnqr3q6w"; + version = "0.1.0.3"; + sha256 = "08pprgn9xnd3ipr6clify3snm4ahshlws869mfvziplc4hdcnb59"; buildDepends = [ caseInsensitive httpTypes mimeTypes mtl restCore restTypes text unorderedContainers utf8String wai diff --git a/pkgs/development/libraries/haskell/servant-pool/default.nix b/pkgs/development/libraries/haskell/servant-pool/default.nix new file mode 100644 index 00000000000..692d694ed46 --- /dev/null +++ b/pkgs/development/libraries/haskell/servant-pool/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, resourcePool, servant, time }: + +cabal.mkDerivation (self: { + pname = "servant-pool"; + version = "0.1"; + sha256 = "0if4lxb0fpdd4lnkz9j7z6vhjbrcc80pvz9jb6sdb9p6sbbgqf69"; + buildDepends = [ resourcePool servant time ]; + meta = { + homepage = "http://github.com/zalora/servant-pool"; + description = "Utility functions for creating servant 'Context's with \"context/connection pooling\" support"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/servant-postgresql/default.nix b/pkgs/development/libraries/haskell/servant-postgresql/default.nix new file mode 100644 index 00000000000..154eefea320 --- /dev/null +++ b/pkgs/development/libraries/haskell/servant-postgresql/default.nix @@ -0,0 +1,18 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, postgresqlSimple, servant, servantPool, servantResponse }: + +cabal.mkDerivation (self: { + pname = "servant-postgresql"; + version = "0.1"; + sha256 = "1svy1v6sl5pq0zs8ms4qf7wn6zar63bqmfiyfqgz84ryli0wxrhj"; + buildDepends = [ + postgresqlSimple servant servantPool servantResponse + ]; + meta = { + homepage = "http://github.com/zalora/servant-postgresql"; + description = "Useful functions and instances for using servant with a PostgreSQL context"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/servant-response/default.nix b/pkgs/development/libraries/haskell/servant-response/default.nix new file mode 100644 index 00000000000..3f7f9c1eee0 --- /dev/null +++ b/pkgs/development/libraries/haskell/servant-response/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, httpTypes, text }: + +cabal.mkDerivation (self: { + pname = "servant-response"; + version = "0.1"; + sha256 = "0vgzi6nm3f1vjbnvhzcr6v2fh75fsl18wsps54ya0mbmfn2v6chy"; + buildDepends = [ aeson httpTypes text ]; + meta = { + homepage = "http://github.com/zalora/servant"; + description = "Machinery to express how servant should turn results of database operations into proper JSON-encodable response types"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/servant-scotty/default.nix b/pkgs/development/libraries/haskell/servant-scotty/default.nix new file mode 100644 index 00000000000..732b2c95cc7 --- /dev/null +++ b/pkgs/development/libraries/haskell/servant-scotty/default.nix @@ -0,0 +1,20 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, httpTypes, scotty, servant, servantResponse, text +, transformers +}: + +cabal.mkDerivation (self: { + pname = "servant-scotty"; + version = "0.1.1"; + sha256 = "0d3yc7aa2p1izizqnj81iscj9hbgbkpyav1ncmxzkr48svr6h783"; + buildDepends = [ + aeson httpTypes scotty servant servantResponse text transformers + ]; + meta = { + homepage = "http://github.com/zalora/servant"; + description = "Generate a web service for servant 'Resource's using scotty and JSON"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/servant/default.nix b/pkgs/development/libraries/haskell/servant/default.nix new file mode 100644 index 00000000000..38f89764c4c --- /dev/null +++ b/pkgs/development/libraries/haskell/servant/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "servant"; + version = "0.1"; + sha256 = "1bm5223rjgcm8rb3s2mclmfj2df7j059jjh572a5py0rdqzg3yj0"; + meta = { + homepage = "http://github.com/zalora/servant"; + description = "A library to generate REST-style webservices on top of scotty, handling all the boilerplate for you"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index 587c42d6033..6deaa209dc8 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.4.1"; - sha256 = "0h38j6vkdgaddj7xardyywibdj5w0wryqxwwpc62idgzlp7mgpb2"; + version = "1.5.5"; + sha256 = "1865f5z5wm2qf3ccws9jy8ps7n8slkmfgn0l2m9apja3q2jajqb1"; buildDepends = [ async enclosedExceptions exceptions liftedAsync liftedBase monadControl mtl systemFileio systemFilepath text time transformers diff --git a/pkgs/development/libraries/haskell/sized/default.nix b/pkgs/development/libraries/haskell/sized/default.nix new file mode 100644 index 00000000000..ae75ff26e4c --- /dev/null +++ b/pkgs/development/libraries/haskell/sized/default.nix @@ -0,0 +1,18 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, constraints, ListLike, monomorphic, typeNatural, vector }: + +cabal.mkDerivation (self: { + pname = "sized"; + version = "0.1.0.0"; + sha256 = "00n9fb7kk3c6dy4j19d9ikmynllpxc7yd51sign0rhvnasmyrghl"; + buildDepends = [ + constraints ListLike monomorphic typeNatural vector + ]; + meta = { + description = "Sized sequence data-types"; + 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/socket-io/default.nix b/pkgs/development/libraries/haskell/socket-io/default.nix index 19d6ff3a667..0a7d4b1c230 100644 --- a/pkgs/development/libraries/haskell/socket-io/default.nix +++ b/pkgs/development/libraries/haskell/socket-io/default.nix @@ -6,14 +6,14 @@ cabal.mkDerivation (self: { pname = "socket-io"; - version = "1.0.1"; - sha256 = "0257c5wf6b9rmprqq5q5d7fih4s2szwv98w16ggl61p8khf5d2qs"; + version = "1.1.0"; + sha256 = "1ffip6jlp3i6pz8gbk8m2ra2q8568mgwgi988yh046w787yf9kpw"; buildDepends = [ aeson attoparsec engineIo mtl stm text transformers unorderedContainers vector ]; - jailbreak = true; meta = { + homepage = "http://github.com/ocharles/engine.io"; 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/statvfs/default.nix b/pkgs/development/libraries/haskell/statvfs/default.nix index bb1ebb1b9d8..15454aa0c97 100644 --- a/pkgs/development/libraries/haskell/statvfs/default.nix +++ b/pkgs/development/libraries/haskell/statvfs/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "statvfs"; - version = "0.1"; - sha256 = "1v45lx7wr27f5sx7cpfsapx1r6akgf1q3hpip1ibbsbhj65ws2r2"; + version = "0.2"; + sha256 = "16z9fddgvf5sl7zy7p74fng9lkdw5m9i5np3q4s2h8jdi43mwmg1"; meta = { description = "Get unix filesystem statistics with statfs, statvfs"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix index afa664a68f9..9cc43e142a7 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.1"; - sha256 = "1jd2dbi844cjs012gwr5idk1jmn860ff8hy1r1s6jndsm69awbba"; + version = "0.5.10.2"; + sha256 = "1r1vwn334jdsk6szynzz7w9jpbfqs3zs7wzlpwfigsyyrjy3bn3q"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/tasty-hunit/default.nix b/pkgs/development/libraries/haskell/tasty-hunit/default.nix index c7e5b53548f..067e6081818 100644 --- a/pkgs/development/libraries/haskell/tasty-hunit/default.nix +++ b/pkgs/development/libraries/haskell/tasty-hunit/default.nix @@ -1,13 +1,14 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, HUnit, mtl, tasty }: +{ cabal, tasty }: cabal.mkDerivation (self: { pname = "tasty-hunit"; - version = "0.8.0.1"; - sha256 = "0a84j8yjqp9x59dy5nbb50vnscb7iimgc60s8vz1p5721gqi62r5"; - buildDepends = [ HUnit mtl tasty ]; + version = "0.9"; + sha256 = "1ivp9h34cdrahqy8i0y10fa0mqxa947dpbwvhr46sjja053asjxc"; + buildDepends = [ tasty ]; meta = { + homepage = "http://documentup.com/feuerbach/tasty"; description = "HUnit support for the Tasty test framework"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/twitter-conduit/default.nix b/pkgs/development/libraries/haskell/twitter-conduit/default.nix index bf2652fa792..0d576680044 100644 --- a/pkgs/development/libraries/haskell/twitter-conduit/default.nix +++ b/pkgs/development/libraries/haskell/twitter-conduit/default.nix @@ -2,27 +2,27 @@ { cabal, aeson, attoparsec, authenticateOauth, caseInsensitive , conduit, conduitExtra, dataDefault, doctest, filepath, hlint -, hspec, httpClient, httpConduit, httpTypes, lens, monadControl -, monadLogger, network, resourcet, shakespeare, text, time +, hspec, httpClient, httpConduit, httpTypes, lens, lensAeson +, monadControl, monadLogger, networkUri, resourcet, text, time , transformers, transformersBase, twitterTypes }: cabal.mkDerivation (self: { pname = "twitter-conduit"; - version = "0.0.5.5"; - sha256 = "13wk863xjlg8g62yhbq4aar7z77n0awh500l6v41fam99lihzxab"; + version = "0.0.5.6"; + sha256 = "1l6gk4538nqknrj082hkdy2jp4gzyq3y473p8gg4mm2n67417r9m"; isLibrary = true; isExecutable = true; buildDepends = [ aeson attoparsec authenticateOauth conduit conduitExtra dataDefault - httpClient httpConduit httpTypes lens monadLogger resourcet - shakespeare text time transformers twitterTypes + httpClient httpConduit httpTypes lens lensAeson monadLogger + networkUri resourcet text time transformers twitterTypes ]; testDepends = [ aeson attoparsec authenticateOauth caseInsensitive conduit conduitExtra dataDefault doctest filepath hlint hspec httpClient - httpConduit httpTypes lens monadControl monadLogger network - resourcet shakespeare text time transformers transformersBase + httpConduit httpTypes lens lensAeson monadControl monadLogger + networkUri resourcet text time transformers transformersBase twitterTypes ]; meta = { @@ -31,5 +31,7 @@ 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/twitter-types/default.nix b/pkgs/development/libraries/haskell/twitter-types/default.nix index 1848211dc3e..4a3df6f1b9f 100644 --- a/pkgs/development/libraries/haskell/twitter-types/default.nix +++ b/pkgs/development/libraries/haskell/twitter-types/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "twitter-types"; - version = "0.4.20140809"; - sha256 = "0f32gjvpzcy5ld2j6mhsvaxaiyzyp5pvqjvmgawaiy78c3kxi8gh"; + version = "0.5.0"; + sha256 = "0nnis96rki60ily7ydq155nawmhz7dn51d1d3hwikb1vz16ji47a"; buildDepends = [ aeson httpTypes text unorderedContainers ]; testDepends = [ aeson attoparsec filepath httpTypes HUnit testFramework diff --git a/pkgs/development/libraries/haskell/type-natural/default.nix b/pkgs/development/libraries/haskell/type-natural/default.nix new file mode 100644 index 00000000000..2e56f8c396b --- /dev/null +++ b/pkgs/development/libraries/haskell/type-natural/default.nix @@ -0,0 +1,20 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, constraints, equationalReasoning, monomorphic, singletons +}: + +cabal.mkDerivation (self: { + pname = "type-natural"; + version = "0.2.3.1"; + sha256 = "0qi5b3d0vkm1b2kda3ifw6g7djx91wj7q36la02yadlvmb4jcp1g"; + buildDepends = [ + constraints equationalReasoning monomorphic singletons + ]; + meta = { + homepage = "https://github.com/konn/type-natural"; + description = "Type-level natural and proofs of their properties"; + 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/vty/5.1.4.nix b/pkgs/development/libraries/haskell/vty/5.2.1.nix index 24d123d67cc..6034807929e 100644 --- a/pkgs/development/libraries/haskell/vty/5.1.4.nix +++ b/pkgs/development/libraries/haskell/vty/5.2.1.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "vty"; - version = "5.1.4"; - sha256 = "157saacy6lp2ngl0dz9ri4ji1vj191d1239x1xykna8y618r0vqf"; + version = "5.2.1"; + sha256 = "15xg7yznizscvyjlnivakrzk60l0a0pigax7sgnn2ab79rfzcxww"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 184adcc03dd..39514c8a3bd 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "3.0.2"; - sha256 = "1xynrcm8i8iyyc4dy7nsziy0g4yc6gqx0h5vs86f85i1j0mrf3xv"; + version = "3.0.2.1"; + sha256 = "02jamvina7m9wjz0hd7gj309d1vcmhgdwyh9y1bfpvq29ngqkkca"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder caseInsensitive dataDefaultClass deepseq fastLogger httpTypes liftedBase network diff --git a/pkgs/development/libraries/haskell/websockets/default.nix b/pkgs/development/libraries/haskell/websockets/default.nix index c74fad5f1a8..5db1ec41613 100644 --- a/pkgs/development/libraries/haskell/websockets/default.nix +++ b/pkgs/development/libraries/haskell/websockets/default.nix @@ -19,7 +19,6 @@ cabal.mkDerivation (self: { entropy HUnit ioStreams mtl network QuickCheck random SHA testFramework testFrameworkHunit testFrameworkQuickcheck2 text ]; - jailbreak = true; meta = { homepage = "http://jaspervdj.be/websockets"; description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; diff --git a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix index 5a3c75f6165..37dc11b1f0f 100644 --- a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "wl-pprint-terminfo"; - version = "3.7.1"; - sha256 = "04220hgrjjsz0ir65s6ynrjgdmqlfcw49fb158w7wgxxh69kc7h6"; + version = "3.7.1.1"; + sha256 = "1mjnbkk3cw2v7nda7qxdkl21pmclz6m17sviqp4qf3rc8rgin3zd"; buildDepends = [ nats semigroups terminfo text transformers wlPprintExtras ]; diff --git a/pkgs/development/libraries/haskell/wreq/default.nix b/pkgs/development/libraries/haskell/wreq/default.nix index 9772418173b..d0a3e94fcd2 100644 --- a/pkgs/development/libraries/haskell/wreq/default.nix +++ b/pkgs/development/libraries/haskell/wreq/default.nix @@ -1,23 +1,24 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, aeson, attoparsec, doctest, exceptions, filepath -, httpClient, httpClientTls, httpTypes, HUnit, lens, mimeTypes -, temporary, testFramework, testFrameworkHunit, text, time +, httpClient, httpClientTls, httpTypes, HUnit, lens, lensAeson +, mimeTypes, temporary, testFramework, testFrameworkHunit, text +, time }: cabal.mkDerivation (self: { pname = "wreq"; - version = "0.1.0.1"; - sha256 = "05w3b555arsab8a5w73nm9pk3p9r6jipi6cd3ngxv48gdn9wzhvz"; + version = "0.2.0.0"; + sha256 = "0ajrwn4yn6h65v97jfhbb4x3j307gdf34dyjnnhsrmsf7911l44d"; isLibrary = true; isExecutable = true; buildDepends = [ aeson attoparsec exceptions httpClient httpClientTls httpTypes lens - mimeTypes text time + lensAeson mimeTypes text time ]; testDepends = [ - aeson doctest filepath httpClient httpTypes HUnit lens temporary - testFramework testFrameworkHunit text + aeson doctest filepath httpClient httpTypes HUnit lens lensAeson + temporary testFramework testFrameworkHunit text ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/xml-lens/default.nix b/pkgs/development/libraries/haskell/xml-lens/default.nix index fd9609ec25f..f9e60441975 100644 --- a/pkgs/development/libraries/haskell/xml-lens/default.nix +++ b/pkgs/development/libraries/haskell/xml-lens/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { version = "0.1.6.1"; sha256 = "093grvlpm19l3g10ka82xpzl2wr0gli71kfkbvk4gvg3194fkw4h"; buildDepends = [ lens text xmlConduit ]; + jailbreak = true; meta = { homepage = "https://github.com/fumieval/xml-lens"; description = "Lenses, traversals, prisms for xml-conduit"; diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index b5438fabc12..26cb0dec098 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yaml"; - version = "0.8.8.4"; - sha256 = "1mh5xv66cqvk0r5n6pwcm11m9489y40l69ca417yvymkksmncc7b"; + version = "0.8.9"; + sha256 = "13qqqil19yi1qbl9gqma6kxwkz8j5iq6z347fabk916gy9jng3dl"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix b/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix new file mode 100644 index 00000000000..9f577fc4520 --- /dev/null +++ b/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix @@ -0,0 +1,22 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, cryptohash, pwstoreFast, text, yesodAuth, yesodCore +, yesodForm, yesodPersistent +}: + +cabal.mkDerivation (self: { + pname = "yesod-auth-hashdb"; + version = "1.3.0.1"; + sha256 = "0q78mw09g6b04zaz54s03222mh59nm604qh8gyw5kka06f93hk4q"; + buildDepends = [ + cryptohash pwstoreFast text yesodAuth yesodCore yesodForm + yesodPersistent + ]; + meta = { + homepage = "http://www.yesodweb.com/"; + description = "Authentication plugin for Yesod"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ ianwookim ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 90d354a22cf..857b237ba42 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -13,8 +13,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.2.19"; - sha256 = "0dlvg8zpr1qyav3svqybsqsrmrl9n8s1kdzxf6zxa3pn582d48il"; + version = "1.2.19.1"; + sha256 = "1021z0jrfbafbdybpj0jkacr9ljyap5cpmfk2911dsz3nz7sy6zg"; buildDepends = [ aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit conduitExtra cookie diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 3c5f198cea6..d4d9663441f 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isCygwin; meta = { - description = "hwloc, a portable abstraction of hierarchical architectures for high-performance computing"; + description = "Portable abstraction of hierarchical architectures for high-performance computing"; longDescription = '' hwloc provides a portable abstraction (across OS, diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index c369a36eb9a..cb4f715f8d8 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.ece.uvic.ca/~mdadams/jasper/; - description = "JasPer JPEG2000 Library"; + description = "JPEG2000 Library"; }; } diff --git a/pkgs/development/libraries/java/classpath/default.nix b/pkgs/development/libraries/java/classpath/default.nix index bbfc6ed38cc..eff52cc177b 100644 --- a/pkgs/development/libraries/java/classpath/default.nix +++ b/pkgs/development/libraries/java/classpath/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { configureFlags = "--disable-Werror --disable-plugin --with-antlr-jar=${antlr}/lib/antlr.jar"; meta = { - description = "GNU Classpath, essential libraries for Java"; + description = "Essential libraries for Java"; longDescription = '' GNU Classpath, Essential Libraries for Java, is a GNU project to create diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index 42bdba7567c..34aaded7cb4 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { ''; meta = { - description = "Mozilla Rhino: JavaScript for Java"; + description = "An implementation of JavaScript written in Java"; longDescription = '' Rhino is an open-source implementation of JavaScript written diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 647a6b03113..eeb09a68afb 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation (rec { cd ${name}/src ''; + configureFlags = "--with-tcl=no"; + #doCheck = true; # report: No suitable file for testing purposes enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index f5a3d92d3db..90ce4f970e3 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "Libassuan, the IPC library used by GnuPG and related software"; + description = "IPC library used by GnuPG and related software"; longDescription = '' Libassuan is a small library implementing the so-called Assuan diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 2268290b9f7..0cbda2e1405 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.13" "1fr3rzykrlm1cla0csm9hqa3gcqp19hf5rgn70nyb9w92r67v685"; libav_9 = libavFun "9.16" "18378gdgzqsxaacc9vl7ligwndbdvy95wbn50hs8xvdqn1rn916a"; - libav_10 = libavFun "10.3" "1fq83rc5534fjqjlhkw5i9k54dmyqn2pgvyillm6pws8rkn9yb5r"; + libav_10 = libavFun "10.4" "1zzvjfdlv9swhq7dzvli1pk8cn02q1076ax9m3cx9ipilbg21639"; }; libavFun = version : sha256 : stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix index b9823cefd2d..9a284d8988d 100644 --- a/pkgs/development/libraries/libcddb/default.nix +++ b/pkgs/development/libraries/libcddb/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "Libcddb is a C library to access data on a CDDB server (freedb.org)"; + description = "C library to access data on a CDDB server (freedb.org)"; license = stdenv.lib.licenses.lgpl2Plus; homepage = http://libcddb.sourceforge.net/; }; diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 51b7f7e181d..9cdf9d411cc 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = http://projects.gnome.org/libchamplain/; license = stdenv.lib.licenses.lgpl2Plus; - description = "libchamplain, a C library providing a ClutterActor to display maps"; + description = "C library providing a ClutterActor to display maps"; longDescription = '' libchamplain is a C library providing a ClutterActor to display diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index f0d7fbfbeb6..37af9756724 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "libchop, tools & library for data backup and distributed storage"; + description = "Tools & library for data backup and distributed storage"; longDescription = '' Libchop is a set of utilities and library for data backup and diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix index ba7e3e47ff7..cb8d07fec90 100644 --- a/pkgs/development/libraries/libdaemon/default.nix +++ b/pkgs/development/libraries/libdaemon/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-lynx" ]; meta = { - description = "libdaemon, a lightweight C library that eases the writing of UNIX daemons"; + description = "Lightweight C library that eases the writing of UNIX daemons"; homepage = http://0pointer.de/lennart/projects/libdaemon/; diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix index f9d1fc87870..8c5c8bef351 100644 --- a/pkgs/development/libraries/libdiscid/default.nix +++ b/pkgs/development/libraries/libdiscid/default.nix @@ -1,26 +1,21 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "libdiscid-0.2.2"; + name = "libdiscid-0.6.1"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake ]; src = fetchurl { - url = "http://users.musicbrainz.org/~matt/${name}.tar.gz"; - sha256 = "00l4ln9rk0vqf67iccwqrgc9qx1al92i05zylh85kd1zn9d5sjwp"; + url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${name}.tar.gz"; + sha256 = "1mbd5y9056638cffpfwc6772xwrsk18prv1djsr6jpfim38jpsxc"; }; - # developer forgot to update his version number - # this is propagated to pkg-config - preConfigure = '' - substituteInPlace "CMakeLists.txt" \ - --replace "PROJECT_VERSION 0.1.1" "PROJECT_VERSION 0.2.2" - ''; - - meta = { + meta = with stdenv.lib; { description = "A C library for creating MusicBrainz DiscIDs from audio CDs"; homepage = http://musicbrainz.org/doc/libdiscid; - license = stdenv.lib.licenses.lgpl21; + maintainers = with maintainers; [ emery ]; + license = licenses.lgpl21; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libdnet/default.nix b/pkgs/development/libraries/libdnet/default.nix index 50bdaa1c4c0..acd930ddd01 100644 --- a/pkgs/development/libraries/libdnet/default.nix +++ b/pkgs/development/libraries/libdnet/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = { - description = "libdnet provides a simplified, portable interface to several low-level networking routines"; + description = "Provides a simplified, portable interface to several low-level networking routines"; homepage = http://code.google.com/p/libdnet/; license = "BSD"; # New BSD license maintainers = [stdenv.lib.maintainers.marcweber]; diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix index 4e04e88eaa6..e6a691df363 100644 --- a/pkgs/development/libraries/libelf/default.nix +++ b/pkgs/development/libraries/libelf/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-nls"; meta = { - description = "Libelf, an ELF object file access library"; + description = "ELF object file access library"; homepage = http://www.mr511.de/software/english.html; diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index bb854139b79..57cf1738342 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; meta = { - description = "libevent, an event notification library"; + description = "Event notification library"; longDescription = '' The libevent API provides a mechanism to execute a callback function diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index 6df5ca683f1..18387c904f8 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { #postInstall = "make check"; meta = { - description = "GNU libextractor, a simple library for keyword extraction"; + description = "Simple library for keyword extraction"; longDescription = '' GNU libextractor is a library used to extract meta-data from files diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index ba3de49ede8..f47d3a62729 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (rec { ''; meta = { - description = "GNU Libgcrypt, a general-pupose cryptographic library"; + description = "General-pupose cryptographic library"; longDescription = '' GNU Libgcrypt is a general purpose cryptographic library based on diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 7b669cd780a..3bdb85a78eb 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "GNU libiconv, an iconv(3) implementation"; + description = "An iconv(3) implementation"; longDescription = '' Some programs, like mailers and web browsers, must be able to convert diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index 802ee9e3e88..37d19d10f29 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/libidn/; - description = "GNU Libidn library for internationalized domain names"; + description = "Library for internationalized domain names"; longDescription = '' GNU Libidn is a fully documented implementation of the diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index 5e038ad8572..dbd2516c059 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -12,6 +12,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnupg.org; - description = "Libksba is a CMS and X.509 access library under development"; + description = "CMS and X.509 access library under development"; }; } diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index 959dca47573..39795267a2c 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - description = "GNU libmicrohttpd, an embeddable HTTP server library"; + description = "Embeddable HTTP server library"; longDescription = '' GNU libmicrohttpd is a small C library that is supposed to make diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/development/libraries/libnfc/default.nix new file mode 100644 index 00000000000..a018ce1f0fa --- /dev/null +++ b/pkgs/development/libraries/libnfc/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, libusb }: + +stdenv.mkDerivation rec { + name = "libnfc-${version}"; + version = "1.7.1"; + + src = fetchurl { + url = "http://dl.bintray.com/nfc-tools/sources/libnfc-1.7.1.tar.bz2"; + sha256 = "0wj0iwwcpmpalyk61aa7yc6i4p9hgdajkrgnlswgk0vnwbc78pll"; + }; + + buildInputs = [ libusb ]; + + meta = with stdenv.lib; { + description = "Open source library libnfc for Near Field Communication"; + license = licenses.gpl3; + homepage = http://code.google.com/p/libnfc/; + maintainers = with maintainers; [offline]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix new file mode 100644 index 00000000000..cb1e8346742 --- /dev/null +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, libmnl }: + +stdenv.mkDerivation rec { + name = "libnftnl-1.0.2"; + + src = fetchurl { + url = "netfilter.org/projects/libnftnl/files/${name}.tar.bz2"; + sha256 = "1p268cv85l4ipd1p9ipjdrfgba14cblp01apv7wc44zmwfr2gkkq"; + }; + + buildInputs = [ pkgconfig libmnl ]; + + meta = with stdenv.lib; { + description = "a userspace library providing a low-level netlink API to the in-kernel nf_tables subsystem"; + homepage = http://netfilter.org/projects/libnftnl; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix index 2e2640e8636..6ffef2140ec 100644 --- a/pkgs/development/libraries/libofa/default.nix +++ b/pkgs/development/libraries/libofa/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://code.google.com/musicip-libofa/; - description = "LibOFA - Library Open Fingerprint Architecture"; + description = "Library Open Fingerprint Architecture"; longDescription = '' LibOFA (Library Open Fingerprint Architecture) is an open-source audio fingerprint created and provided by MusicIP''; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 0056212dfbb..fa5c64eb911 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.12"; - sha256 = "0pkcirbfzhqqsm3hr2alxprw5n22a836qk4df1jnns6jk79gcby3"; + version = "1.6.13"; + sha256 = "09g631h1f1xvrdiy36mh1034r9w46damp9jcg7nm507wlmacxj6r"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz"; - sha256 = "0r2vmsc4cvxisjr7jqw2vjf66isb2fhs4nnssz3l3jgdangj8wz0"; + sha256 = "017pnxp3zhhlh6mg2yqn5xrb6dcxc5p3dp1kr46p8xx052i0hzqb"; }; whenPatched = stdenv.lib.optionalString apngSupport; diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index ae6299286a1..b6be8d194c1 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/libsigsegv/; - description = "GNU libsigsegv, a library to handle page faults in user mode"; + description = "Library to handle page faults in user mode"; longDescription = '' GNU libsigsegv is a library for handling page faults in user mode. A diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix index 7d46f9e32ce..0e5f976c122 100644 --- a/pkgs/development/libraries/libspectre/default.nix +++ b/pkgs/development/libraries/libspectre/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://libspectre.freedesktop.org/; - description = "libspectre, a PostScript rendering library"; + description = "PostScript rendering library"; longDescription = '' libspectre is a small library for rendering Postscript diff --git a/pkgs/development/libraries/libtar/default.nix b/pkgs/development/libraries/libtar/default.nix new file mode 100644 index 00000000000..212a3a23939 --- /dev/null +++ b/pkgs/development/libraries/libtar/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchgit, fetchpatch, autoreconfHook }: + +stdenv.mkDerivation rec { + version = "1.2.20"; + name = "libtar-${version}"; + + # Maintenance repo for libtar (Arch Linux uses this) + src = fetchgit { + url = "git://repo.or.cz/libtar.git"; + rev = "refs/tags/v${version}"; + sha256 = "1pjsqnqjaqgkzf1j8m6y5h76bwprffsjjj6gk8rh2fjsha14rqn9"; + }; + + patches = let + fp = name: sha256: + fetchpatch { + url = "http://sources.debian.net/data/main/libt/libtar/1.2.20-4/debian/patches/${name}.patch"; + inherit sha256; + }; + in [ + (fp "no_static_buffers" "0yv90bhvqjj0v650gzn8fbzhdhzx5z0r1lh5h9nv39wnww435bd0") + (fp "no_maxpathlen" "11riv231wpbdb1cm4nbdwdsik97wny5sxcwdgknqbp61ibk572b7") + (fp "CVE-2013-4420" "0d010190bqgr2ggy02qwxvjaymy9a22jmyfwdfh4086v876cbxpq") + (fp "th_get_size-unsigned-int" "1ravbs5yrfac98mnkrzciw9hd2fxq4dc07xl3wx8y2pv1bzkwm41") + ]; + + buildInputs = [ autoreconfHook ]; + + meta = with stdenv.lib; { + description = "C library for manipulating POSIX tar files"; + homepage = http://www.feep.net/libtar/; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index bae22ef220f..5a2508a4506 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/libtasn1/; - description = "GNU Libtasn1, an ASN.1 library"; + description = "An ASN.1 library"; longDescription = '' Libtasn1 is the ASN.1 library used by GnuTLS, GNU Shishi and some diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 6741838d33b..b5665fe402e 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 = "e1158be5a6"; - date = "20140728"; + version = "f83fcbb13c0"; + date = "20140811"; 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 = "1rsh1pbwvngsx5slmd6608b1zqs3jvq70bjr9zyziap9vxka3z1v"; + sha256 = "09g74h3qnx9adyxxvzay8m2idbgbln7m4kkm7sg9925mvi5abb1w"; }; NIX_LDFLAGS = "-lgcc_s"; diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index b578d895c5f..2a87d7a3249 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (rec { meta = { homepage = http://www.gnu.org/software/libunistring/; - description = "GNU Libunistring, a Unicode string library"; + description = "Unicode string library"; longDescription = '' This library provides functions for manipulating Unicode strings diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index bd1f926c9cb..b11b889a8d9 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -100,4 +100,5 @@ in v0_11_24 = "1hygn81iwbdshzrq603qm6k1r7pjflx9qqazmlb72c3vy1hq21c6"; v0_11_25 = "1abszivlxf0sddwvcj3jywfsip5q9vz6axvn40qqyl8sjs80zcvj"; v0_11_26 = "1pfjdwrxhqz1vqcdm42g3j45ghrb4yl7wsngvraclhgqicff1sc3"; + v0_11_29 = "1z07phfwryfy2155p3lxcm2a33h20sfl96lds5dghn157x6csz7m"; } diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 4027bd8a84e..e2ff06fcd43 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -4,14 +4,14 @@ , dnsmasq, libnl }: -let version = "1.2.5"; in +let version = "1.2.7"; in stdenv.mkDerivation rec { name = "libvirt-${version}"; src = fetchurl { url = "http://libvirt.org/sources/${name}.tar.gz"; - sha256 = "0igd74wkksgv24i2xaa8wx51iqpgjp1v7820pk93m0jv8gipvscf"; + sha256 = "1z6yfzzbf9rvqjq1my7x1br73g8dz8kij3khpb4x520ip8n4dyrx"; }; buildInputs = [ diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix index 85f0dbddb0b..42c427605c4 100644 --- a/pkgs/development/libraries/libxmi/default.nix +++ b/pkgs/development/libraries/libxmi/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { preConfigure = "cp ${libtool}/share/libtool/config/config.sub ."; meta = { - description = "GNU libxmi, a library for rasterizing 2-D vector graphics"; + description = "Library for rasterizing 2-D vector graphics"; homepage = http://www.gnu.org/software/libxmi/; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix index 951627c81c2..036d9c61d07 100644 --- a/pkgs/development/libraries/lightning/default.nix +++ b/pkgs/development/libraries/lightning/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, binutils }: stdenv.mkDerivation rec { - name = "lightning-2.0.4"; + name = "lightning-2.0.5"; src = fetchurl { - url = "ftp://ftp.gnu.org/gnu/lightning/${name}.tar.gz"; - sha256 = "1lrckrx51d5hrv66bc99fd4b7g2wwn4vr304hwq3glfzhb8jqcdy"; + url = "mirror://gnu/lightning/${name}.tar.gz"; + sha256 = "0jm9a8ddxc1v9hyzyv4ybg37fjac2yjqv1hkd262wxzqms36mdk5"; }; # Needs libopcodes.so from binutils for 'make check' @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/lightning/; - description = "GNU lightning, a run-time code generation library"; + description = "Run-time code generation library"; longDescription = '' GNU lightning is a library that generates assembly language code diff --git a/pkgs/development/libraries/ming/default.nix b/pkgs/development/libraries/ming/default.nix index f9632dca9d2..a470f771561 100644 --- a/pkgs/development/libraries/ming/default.nix +++ b/pkgs/development/libraries/ming/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "Ming, a library for generating Flash `.swf' files"; + description = "Library for generating Flash `.swf' files"; longDescription = '' Ming is a library for generating Macromedia Flash files (.swf), diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index bfd474c88e7..88f18003977 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "movit-${version}"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { url = "http://movit.sesse.net/${name}.tar.gz"; - sha256 = "1k3qbkxapcplpsx22xh4m4ccp9fhsjfcj3pjzbcnrc51103aklag"; + sha256 = "0jka9l3cx7q09rpz5x6rv6ii8kbgm2vc419gx2rb9rc8sl81hzj1"; }; GTEST_DIR = "${gtest}"; diff --git a/pkgs/development/libraries/mpc/default.nix b/pkgs/development/libraries/mpc/default.nix index 652227d47e8..3d05fa2e040 100644 --- a/pkgs/development/libraries/mpc/default.nix +++ b/pkgs/development/libraries/mpc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU MPC, a library for multiprecision complex arithmetic with exact rounding"; + description = "Library for multiprecision complex arithmetic with exact rounding"; longDescription = '' GNU MPC is a C library for the arithmetic of complex numbers with diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index 1d62dfff3c9..901752e3fe3 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.mpfr.org/; - description = "GNU MPFR, a library for multiple-precision floating-point arithmetic"; + description = "Library for multiple-precision floating-point arithmetic"; longDescription = '' The GNU MPFR library is a C library for multiple-precision diff --git a/pkgs/development/libraries/mpich2/default.nix b/pkgs/development/libraries/mpich2/default.nix index 5fba9c56418..b80d549931c 100644 --- a/pkgs/development/libraries/mpich2/default.nix +++ b/pkgs/development/libraries/mpich2/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { ''; meta = { - description = "MPICH2, an implementation of the Message Passing Interface (MPI) standard"; + description = "Implementation of the Message Passing Interface (MPI) standard"; longDescription = '' MPICH2 is a free high-performance and portable implementation of diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 87953c1158d..631199bf87c 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { postFixup = lib.optionalString stdenv.isDarwin "rm $out/lib/*.so"; meta = { - description = "GNU Ncurses, a free software emulation of curses in SVR4 and more"; + description = "Free software emulation of curses in SVR4 and more"; longDescription = '' The Ncurses (new curses) library is a free software emulation of diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index 57d3732fa6d..38d197c69ab 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (rec { ./cygwin.patch; meta = { - description = "GNU Nettle, a cryptographic library"; + description = "Cryptographic library"; longDescription = '' Nettle is a cryptographic library that is designed to fit diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index 3b4f7da94f3..2c208ce86bb 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.mit; maintaners = [ stdenv.lib.maintainers.shlevy ]; platforms = stdenv.lib.platforms.all; + broken = true; }; } diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index 47a51b68d03..08069533713 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.geocities.jp/kosako3/oniguruma/; - description = "Oniguruma regular expressions library"; + description = "Regular expressions library"; license = "BSD"; }; } diff --git a/pkgs/development/libraries/opal/default.nix b/pkgs/development/libraries/opal/default.nix index 1f59c0c24a0..c79c3cbe4d6 100644 --- a/pkgs/development/libraries/opal/default.nix +++ b/pkgs/development/libraries/opal/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { patches = [ ./disable-samples-ftbfs.diff ./libav9.patch ./libav10.patch ]; meta = with stdenv.lib; { - description = "OPAL VoIP library"; + description = "VoIP library"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/openal/default.nix b/pkgs/development/libraries/openal/default.nix index b5e390eafa8..5a935691ca5 100644 --- a/pkgs/development/libraries/openal/default.nix +++ b/pkgs/development/libraries/openal/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; meta = { - description = "OpenAL, a cross-platform 3D audio API"; + description = "Cross-platform 3D audio API"; longDescription = '' OpenAL is a cross-platform 3D audio API appropriate for use with diff --git a/pkgs/development/libraries/opencascade/oce.nix b/pkgs/development/libraries/opencascade/oce.nix index 0da8d2a7404..480664a0d4d 100644 --- a/pkgs/development/libraries/opencascade/oce.nix +++ b/pkgs/development/libraries/opencascade/oce.nix @@ -2,10 +2,10 @@ ftgl, freetype}: stdenv.mkDerivation rec { - name = "opencascade-oce-0.14.1"; + name = "opencascade-oce-0.16"; src = fetchurl { - url = https://github.com/tpaviot/oce/archive/OCE-0.14.1.tar.gz; - sha256 = "0pfc94nmzipm6zmxywxbly1cpfr6wadxasqqkkbdvzg937mrwl5d"; + url = https://github.com/tpaviot/oce/archive/OCE-0.16.tar.gz; + sha256 = "05bmg1cjz827bpq8s0hp96byirm4c3zc9vx26qz76kjsg8ry87w4"; }; buildInputs = [ mesa tcl tk file libXmu libtool qt4 ftgl freetype cmake ]; diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index c9da441705c..cfbbce2f559 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-overlays" + "--disable-dependency-tracking" # speeds up one-time build ] ++ stdenv.lib.optional (openssl == null) "--without-tls" ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl"; diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 678a439fe0a..15160d3afc4 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,4 +1,13 @@ -{stdenv, fetchurl, gfortran}: +{stdenv, fetchurl, gfortran + +# Enable the Sun Grid Engine bindings +, enableSGE ? false + +# Pass PATH/LD_LIBRARY_PATH to point to current mpirun by default +, enablePrefix ? false +}: + +with stdenv.lib; stdenv.mkDerivation { name = "openmpi-1.6.5"; @@ -7,6 +16,10 @@ stdenv.mkDerivation { sha256 = "11gws4d3z7934zna2r7m1f80iay2ha17kp42mkh39wjykfwbldzy"; }; buildInputs = [ gfortran ]; + configureFlags = [] + ++ optional enableSGE "--with-sge" + ++ optional enablePrefix "--enable-mpirun-prefix-by-default" + ; meta = { homePage = http://www.open-mpi.org/; description = "Open source MPI-2 implementation"; diff --git a/pkgs/development/libraries/pdf2htmlex/default.nix b/pkgs/development/libraries/pdf2htmlex/default.nix deleted file mode 100644 index 597385aa9fa..00000000000 --- a/pkgs/development/libraries/pdf2htmlex/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{stdenv, fetchurl, cmake, poppler, fontforge, unzip, pkgconfig, python}: - -stdenv.mkDerivation rec { - version = "0.8.1"; - name = "pdf2htmlex-${version}"; - - src = fetchurl { - url = "https://github.com/coolwanglu/pdf2htmlEX/archive/v${version}.zip"; - sha256 = "0v8x03vq46ng9s27ryn76lcsjgpxgak6062jnx59lnyz856wvp8a"; - }; - - buildInputs = [ - cmake - unzip - poppler - fontforge - pkgconfig - python - ]; - - meta = with stdenv.lib; { - description = "Convert PDF to HTML without losing text or format. "; - license = licenses.gpl3; - maintainers = [ maintainers.iElectric ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix index 35262f797e9..4ab6fb3ad8b 100644 --- a/pkgs/development/libraries/plib/default.nix +++ b/pkgs/development/libraries/plib/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = { - description = "PLIB: A Suite of Portable Game Libraries"; + description = "A suite of portable game libraries"; longDescription = '' PLIB includes sound effects, music, a complete 3D engine, font diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index f93eee674ff..9edef767481 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "PPL: The Parma Polyhedra Library"; + description = "The Parma Polyhedra Library"; longDescription = '' The Parma Polyhedra Library (PPL) provides numerical abstractions diff --git a/pkgs/development/libraries/protobuf/default.nix b/pkgs/development/libraries/protobuf/default.nix index bba8481780a..3452335decd 100644 --- a/pkgs/development/libraries/protobuf/default.nix +++ b/pkgs/development/libraries/protobuf/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, zlib }: stdenv.mkDerivation rec { - name = "protobuf-2.5.0"; + name = "protobuf-2.6.0"; src = fetchurl { - url = "http://protobuf.googlecode.com/files/${name}.tar.bz2"; - sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk"; + url = "http://protobuf.googlecode.com/svn-history/r579/rc/protobuf-2.6.0.tar.bz2"; + sha256 = "0krfkxc85vfznqwbh59qlhp7ld81al9ss35av0gfbg74i0rvjids"; }; buildInputs = [ zlib ]; diff --git a/pkgs/development/libraries/qt-5/qt-5.3.nix b/pkgs/development/libraries/qt-5/qt-5.3.nix index 1722a1e52a1..18b464c6f24 100644 --- a/pkgs/development/libraries/qt-5/qt-5.3.nix +++ b/pkgs/development/libraries/qt-5/qt-5.3.nix @@ -18,7 +18,7 @@ with stdenv.lib; let v_maj = "5.3"; - v_min = "0"; + v_min = "1"; ver = "${v_maj}.${v_min}"; in @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.qt-project.org/official_releases/qt/" + "${v_maj}/${ver}/single/qt-everywhere-opensource-src-${ver}.tar.gz"; - sha256 = "09gp19377zpqyfzk063b3pjz8gjm2x7xsj71bdpmnhs1scz0khcj"; + sha256 = "189mgfqxjg0jp0vkfrj55p9brl018wzf7lir8yjr0pajp8jqd2ds"; }; # The version property must be kept because it will be included into the QtSDK package name diff --git a/pkgs/development/libraries/readline/readline6.3.nix b/pkgs/development/libraries/readline/readline6.3.nix index 356c2c055bd..04db1ffd446 100644 --- a/pkgs/development/libraries/readline/readline6.3.nix +++ b/pkgs/development/libraries/readline/readline6.3.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (rec { ]; meta = with stdenv.lib; { - description = "GNU Readline, a library for interactive line editing"; + description = "Library for interactive line editing"; longDescription = '' The GNU Readline library provides a set of functions for use by diff --git a/pkgs/development/libraries/readline/readline6.nix b/pkgs/development/libraries/readline/readline6.nix index 0559113285c..d72d6566bbc 100644 --- a/pkgs/development/libraries/readline/readline6.nix +++ b/pkgs/development/libraries/readline/readline6.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (rec { import ./readline-6.2-patches.nix patch); meta = { - description = "GNU Readline, a library for interactive line editing"; + description = "Library for interactive line editing"; longDescription = '' The GNU Readline library provides a set of functions for use by diff --git a/pkgs/development/libraries/science/biology/biolib/default.nix b/pkgs/development/libraries/science/biology/biolib/default.nix index 0461e5ebcf5..7418bdb6dfe 100644 --- a/pkgs/development/libraries/science/biology/biolib/default.nix +++ b/pkgs/development/libraries/science/biology/biolib/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://biolib.open-bio.org/"; - description = "BioLib"; + description = "Shared libraries for the major Bio* languages"; license = stdenv.lib.licenses.gpl2; longDescription = '' BioLib brings together a set of opensource libraries written diff --git a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix new file mode 100644 index 00000000000..0b4badf26e7 --- /dev/null +++ b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, gfortran, atlas, cmake, python, shared ? false }: +let + atlasMaybeShared = atlas.override { inherit shared; }; + usedLibExtension = if shared then ".so" else ".a"; +in +stdenv.mkDerivation rec { + version = "3.5.0"; + name = "liblapack-${version}"; + src = fetchurl { + url = "http://www.netlib.org/lapack/lapack-${version}.tgz"; + sha256 = "0lk3f97i9imqascnlf6wr5mjpyxqcdj73pgj97dj2mgvyg9z1n4s"; + }; + + propagatedBuildInputs = [ atlasMaybeShared ]; + buildInputs = [ gfortran cmake ]; + nativeBuildInputs = [ python ]; + + cmakeFlags = [ + "-DUSE_OPTIMIZED_BLAS=ON" + "-DBLAS_ATLAS_f77blas_LIBRARY=${atlasMaybeShared}/lib/libf77blas${usedLibExtension}" + "-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}" + "-DCMAKE_Fortran_FLAGS=-fPIC" + ] + ++ (stdenv.lib.optional shared "-DBUILD_SHARED_LIBS=ON") + ; + + doCheck = ! shared; + + checkPhase = " + sed -i 's,^#!.*,#!${python}/bin/python,' lapack_testing.py + ctest + "; + + enableParallelBuilding = true; + + passthru = { + blas = atlas; + }; + + meta = { + inherit version; + description = "Linear Algebra PACKage"; + homepage = "http://www.netlib.org/lapack/"; + license = "revised-BSD"; + + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index f1c99397452..9f4f43311a4 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -2,11 +2,12 @@ let atlasMaybeShared = atlas.override { inherit shared; }; usedLibExtension = if shared then ".so" else ".a"; + version = "3.4.1"; in -stdenv.mkDerivation { - name = "liblapack-3.4.1"; +stdenv.mkDerivation rec { + name = "liblapack-${version}"; src = fetchurl { - url = "http://www.netlib.org/lapack/lapack-3.4.1.tgz"; + url = "http://www.netlib.org/lapack/lapack-${version}.tgz"; sha256 = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f"; }; @@ -37,6 +38,7 @@ stdenv.mkDerivation { }; meta = { + inherit version; description = "Linear Algebra PACKage"; homepage = "http://www.netlib.org/lapack/"; license = "revised-BSD"; diff --git a/pkgs/development/libraries/science/math/openblas/0.2.10.nix b/pkgs/development/libraries/science/math/openblas/0.2.10.nix new file mode 100644 index 00000000000..a8db0631911 --- /dev/null +++ b/pkgs/development/libraries/science/math/openblas/0.2.10.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, gfortran, perl, liblapack }: + +stdenv.mkDerivation rec { + version = "0.2.10"; + + name = "openblas-${version}"; + src = fetchurl { + url = "https://github.com/xianyi/OpenBLAS/tarball/v${version}"; + sha256 = "06i0q4qnd5q5xljzrgvda0gjsczc6l2pl9hw6dn2qjpw38al73za"; + name = "openblas-${version}.tar.gz"; + }; + + preBuild = "cp ${liblapack.src} lapack-${liblapack.meta.version}.tgz"; + + buildInputs = [gfortran perl]; + + cpu = builtins.head (stdenv.lib.splitString "-" stdenv.system); + + target = if cpu == "i686" then "P2" else + if cpu == "x86_64" then "CORE2" else + # allow autodetect + ""; + + makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\" INTERFACE64=1"; + + meta = { + description = "Basic Linear Algebra Subprograms"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/xianyi/OpenBLAS"; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 6ea7333f698..c535b1a39db 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -1,12 +1,7 @@ -{ stdenv, fetchurl, gfortran, perl }: +{ stdenv, fetchurl, gfortran, perl, liblapack }: stdenv.mkDerivation rec { version = "0.2.2"; - lapack_version = "3.4.1"; - lapack_src = fetchurl { - url = "http://www.netlib.org/lapack/lapack-${lapack_version}.tgz"; - sha256 = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f"; - }; name = "openblas-${version}"; src = fetchurl { @@ -15,7 +10,7 @@ stdenv.mkDerivation rec { name = "openblas-${version}.tar.gz"; }; - preBuild = "cp ${lapack_src} lapack-${lapack_version}.tgz"; + preBuild = "cp ${liblapack.src} lapack-${liblapack.meta.version}.tgz"; buildInputs = [gfortran perl]; diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix new file mode 100644 index 00000000000..842d74848df --- /dev/null +++ b/pkgs/development/libraries/skalibs/default.nix @@ -0,0 +1,58 @@ +{stdenv, fetchurl}: + +let + + version = "1.6.0.0"; + +in stdenv.mkDerivation rec { + name = "skalibs-${version}"; + + src = fetchurl { + url = "http://skarnet.org/software/skalibs/${name}.tar.gz"; + sha256 = "0jz3farll9n5jvz3g6wri99s6njkgmnf0r9jqjlg03f20dzv8c8w"; + }; + + sourceRoot = "prog/${name}"; + + # 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 + ''; + + preInstall = '' + mkdir -p "$out/etc" + ''; + + meta = { + homepage = http://skarnet.org/software/skalibs/; + 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/skalibs/getpeereid.patch b/pkgs/development/libraries/skalibs/getpeereid.patch new file mode 100644 index 00000000000..c366780e267 --- /dev/null +++ b/pkgs/development/libraries/skalibs/getpeereid.patch @@ -0,0 +1,28 @@ +--- a/src/libstddjb/getpeereid.h ++++ b/src/libstddjb/getpeereid.h +@@ -3,6 +3,14 @@ + #ifndef GETPEEREID_H + #define GETPEEREID_H + ++#include "sysdeps.h" ++ ++#ifdef HASGETPEEREID ++/* syscall exists - do nothing */ ++ ++#else ++ + extern int getpeereid (int, int *, int *) ; + + #endif ++#endif +--- a/src/libstddjb/ipc_eid.c ++++ b/src/libstddjb/ipc_eid.c +@@ -5,7 +5,7 @@ + + int ipc_eid (int s, unsigned int *u, unsigned int *g) + { +- int dummyu, dummyg ; ++ unsigned int dummyu, dummyg ; + if (getpeereid(s, &dummyu, &dummyg) < 0) return -1 ; + *u = (unsigned int)dummyu ; + *g = (unsigned int)dummyg ; diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix index 17f9c973fd0..2ad2ed55d7c 100644 --- a/pkgs/development/libraries/szip/default.nix +++ b/pkgs/development/libraries/szip/default.nix @@ -8,9 +8,7 @@ stdenv.mkDerivation { }; meta = { - description = " - Szip is a compression library that can be used with the hdf5 library. - "; + description = "Compression library that can be used with the hdf5 library"; homepage = http://www.hdfgroup.org/doc_resource/SZIP/; license = stdenv.lib.licenses.unfree; }; diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index e04363326d0..15e89d9210a 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { '' else ""; meta = { - description = "talloc is a hierarchical pool based memory allocator with destructors"; + description = "Hierarchical pool based memory allocator with destructors"; homepage = http://tdb.samba.org/; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index d0eb8987ea0..c5331656435 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxslt libxml2 docbook_xsl ]; meta = { - description = "TDB, the trivial database"; + description = "The trivial database"; longDescription = '' TDB is a Trivial Database. In concept, it is very much like GDBM, and BSD's DB except that it allows multiple simultaneous writers and diff --git a/pkgs/development/libraries/tecla/default.nix b/pkgs/development/libraries/tecla/default.nix index 6cb20f4e356..f83b34e40d1 100644 --- a/pkgs/development/libraries/tecla/default.nix +++ b/pkgs/development/libraries/tecla/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.astro.caltech.edu/~mcs/tecla/"; - description = "Tecla command-line editing library"; + description = "Command-line editing library"; license = "as-is"; hydraPlatforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index f3ac325b5a1..0e8a95d5ac1 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU uCommon C++, C++ library to facilitate using C++ design patterns"; + description = "C++ library to facilitate using C++ design patterns"; homepage = http://www.gnu.org/software/commoncpp/; license = stdenv.lib.licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index d3a2511c90c..4c86de7fb56 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { '' else null; meta = with stdenv.lib; { - description = "V8 is Google's open source JavaScript engine"; + description = "Google's open source JavaScript engine"; platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd3; }; diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 99837974b1d..d74a85a9162 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ libuuid zlib ]; meta = { - description = "Xapian Probabilistic Information Retrieval library"; + description = "Search engine library"; homepage = "http://xapian.org"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.chaoflow ]; diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/development/libraries/xbase/default.nix index 81447276db7..95ba2a05ad9 100644 --- a/pkgs/development/libraries/xbase/default.nix +++ b/pkgs/development/libraries/xbase/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = http://linux.techass.com/projects/xdb/; - description = "XBase compatible C++ class library formerly known as XDB"; + description = "C++ class library formerly known as XDB"; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.urkud ]; }; diff --git a/pkgs/development/libraries/xylib/default.nix b/pkgs/development/libraries/xylib/default.nix index 8fff5f39338..fe9b6c5c3ca 100644 --- a/pkgs/development/libraries/xylib/default.nix +++ b/pkgs/development/libraries/xylib/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [boost zlib bzip2 ]; meta = { - description = "xylib is a portable library for reading files that contain x-y data from powder diffraction, spectroscopy and other experimental methods."; + description = "Portable library for reading files that contain x-y data from powder diffraction, spectroscopy and other experimental methods"; license = "LGPL"; homepage = http://xylib.sourceforge.net/; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index 3ef43baca5e..d0de624890b 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -3,10 +3,11 @@ , gtk3, json_glib, librdf_raptor2, pythonPackages, dbus_glib }: stdenv.mkDerivation rec { - name = "zeitgeist-0.0.14"; + version = "0.9.15"; + name = "zeitgeist-${version}"; src = fetchurl { - url = "https://github.com/seiflotfy/zeitgeist/archive/v0.9.15.tar.gz"; + url = "https://github.com/seiflotfy/zeitgeist/archive/v${version}.tar.gz"; sha256 = "07pnc7kmjpd0ncm32z6s3ny5p4zl52v9lld0n0f8sp6cw87k12p0"; }; diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index bc022bd70b4..422c1516f2d 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -52,6 +52,12 @@ rec { alsaLib_32bit = pkgs_i686.alsaLib; }; + androidsdk_2_1 = androidsdk { + platformVersions = [ "7" ]; + abiVersions = [ "armeabi-v7a" ]; + useGoogleAPIs = true; + }; + androidsdk_2_2 = androidsdk { platformVersions = [ "8" ]; abiVersions = [ "armeabi-v7a" ]; @@ -82,6 +88,12 @@ rec { useGoogleAPIs = true; }; + androidsdk_4_4 = androidsdk { + platformVersions = [ "19" ]; + abiVersions = [ "armeabi-v7a" "x86" ]; + useGoogleAPIs = true; + }; + androidndk = import ./androidndk.nix { inherit (pkgs) stdenv fetchurl zlib ncurses; }; diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix new file mode 100644 index 00000000000..7178452e3dd --- /dev/null +++ b/pkgs/development/ocaml-modules/csv/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl, ocaml, findlib}: +stdenv.mkDerivation { + + name = "ocaml-csv-1.3.3"; + + src = fetchurl { + url = "https://forge.ocamlcore.org/frs/download.php/1376/csv-1.3.3.tar.gz"; + sha256 = "19qsvw3n7k4xpy0sw7n5s29kzj91myihjljhr5js6xcxwj4cydh2"; + }; + + buildInputs = [ ocaml findlib ]; + + createFindlibDestdir = true; + + configurePhase = "ocaml setup.ml -configure --prefix $out"; + + buildPhase = "ocaml setup.ml -build"; + + installPhase = "ocaml setup.ml -install"; + + meta = { + description = "A pure OCaml library to read and write CSV files"; + homepage = "https://forge.ocamlcore.org/projects/csv/"; + license = stdenv.lib.licenses.lgpl21; + platforms = ocaml.meta.platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index 8b977dd7c52..7bc7e398948 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib}: +{stdenv, fetchurl, ocaml, findlib, minimal ? true}: stdenv.mkDerivation { name = "ocaml-extlib-1.6.1"; @@ -14,8 +14,8 @@ stdenv.mkDerivation { configurePhase = "true"; # Skip configure # De facto, option minimal=1 seems to be the default. See the README. - buildPhase = "make minimal=1 build"; - installPhase = "make minimal=1 install"; + buildPhase = "make ${if minimal then "minimal=1" else ""} build"; + installPhase = "make ${if minimal then "minimal=1" else ""} install"; meta = { homepage = http://code.google.com/p/ocaml-extlib/; diff --git a/pkgs/development/ocaml-modules/javalib/Makefile.config.example.patch b/pkgs/development/ocaml-modules/javalib/Makefile.config.example.patch new file mode 100644 index 00000000000..c06144a75c0 --- /dev/null +++ b/pkgs/development/ocaml-modules/javalib/Makefile.config.example.patch @@ -0,0 +1,9 @@ +--- javalib-2.3-orig/Makefile.config.example 2013-10-30 08:35:30.000000000 +0100 ++++ javalib-2.3/Makefile.config.example 2014-07-06 17:32:29.799398394 +0200 +@@ -1,6 +1,3 @@ +-export OCAMLFIND_DESTDIR=$(LOCALDEST) +-export OCAMLPATH=$(LOCALDEST) +- + OCAMLC = $(FINDER) ocamlc $(FLAGS) + OCAMLOPT = $(FINDER) ocamlopt $(OPT_FLAGS) + OCAMLDOC = $(FINDER) ocamldoc diff --git a/pkgs/development/ocaml-modules/javalib/configure.sh.patch b/pkgs/development/ocaml-modules/javalib/configure.sh.patch new file mode 100644 index 00000000000..67e019b277a --- /dev/null +++ b/pkgs/development/ocaml-modules/javalib/configure.sh.patch @@ -0,0 +1,11 @@ +--- javalib-2.3-orig/configure.sh 2013-10-30 08:35:30.000000000 +0100 ++++ javalib-2.3/configure.sh 2014-07-06 17:28:39.025066199 +0200 +@@ -44,7 +44,7 @@ + DESTDIR= + # The ocamlpath variable for the compiler to locate the locally-installed + # packages (depends on LOCALDEST) +-OCAMLPATH= ++#OCAMLPATH= + # The packages that need to be made in addition to Savalib / Sawja + MAKEDEP= + # The packages that need to be made in addition to Savalib / Sawja diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix new file mode 100644 index 00000000000..2fa72dcf07f --- /dev/null +++ b/pkgs/development/ocaml-modules/javalib/default.nix @@ -0,0 +1,40 @@ +{stdenv, fetchurl, which, ocaml, findlib, camlzip, extlib}: +let + pname = "javalib"; + version = "2.3"; + webpage = "http://sawja.inria.fr/"; + ocaml_version = (builtins.parseDrvName ocaml.name).version; +in +stdenv.mkDerivation rec { + + name = "ocaml-${pname}-${version}"; + + src = fetchurl { + url = "https://gforge.inria.fr/frs/download.php/33090/${pname}-${version}.tar.bz2"; + sha256 = "1i8djcanzm250mwilm3jfy37cz0k0x7jbnrz8a5vvdi91kyzh52j"; + }; + + buildInputs = [ which ocaml findlib camlzip extlib ]; + + patches = [ ./configure.sh.patch ./Makefile.config.example.patch ]; + + createFindlibDestdir = true; + + configureScript = "./configure.sh"; + dontAddPrefix = "true"; + + preBuild = '' + make ptrees; + make installptrees; + export OCAMLPATH=$out/lib/ocaml/${ocaml_version}/site-lib/:$OCAMLPATH; + ''; + + propagatedBuildInputs = [ camlzip extlib ]; + + meta = { + description = "A library that parses Java .class files into OCaml data structures"; + homepage = "${webpage}"; + license = stdenv.lib.licenses.lgpl3; + platforms = ocaml.meta.platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/sawja/Makefile.config.example.patch b/pkgs/development/ocaml-modules/sawja/Makefile.config.example.patch new file mode 100644 index 00000000000..4f2cc99e76b --- /dev/null +++ b/pkgs/development/ocaml-modules/sawja/Makefile.config.example.patch @@ -0,0 +1,9 @@ +--- sawja-1.5-orig/Makefile.config.example 2013-10-30 08:35:29.000000000 +0100 ++++ sawja-1.5/Makefile.config.example 2014-07-05 18:54:37.902423482 +0200 +@@ -1,6 +1,3 @@ +-export OCAMLFIND_DESTDIR=$(LOCALDEST) +-export OCAMLPATH=$(LOCALDEST) +- + RECODE=-charset utf-8 + DOCDIR = doc/api + diff --git a/pkgs/development/ocaml-modules/sawja/configure.sh.patch b/pkgs/development/ocaml-modules/sawja/configure.sh.patch new file mode 100644 index 00000000000..8165de242f5 --- /dev/null +++ b/pkgs/development/ocaml-modules/sawja/configure.sh.patch @@ -0,0 +1,11 @@ +--- sawja-1.5-orig/configure.sh 2013-10-30 08:35:29.000000000 +0100 ++++ sawja-1.5/configure.sh 2014-07-05 18:50:26.833798254 +0200 +@@ -39,7 +39,7 @@ + DESTDIR= + # The ocamlpath variable for the compiler to locate the locally-installed + # packages (depends on LOCALDEST) +-OCAMLPATH= ++#OCAMLPATH= + # The path to ocamlfind + FINDER=`which ocamlfind` + # The perl executable diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix new file mode 100644 index 00000000000..bed87a50f81 --- /dev/null +++ b/pkgs/development/ocaml-modules/sawja/default.nix @@ -0,0 +1,33 @@ +{stdenv, fetchurl, which, perl, ocaml, findlib, javalib }: +let + pname = "sawja"; + version = "1.5"; + webpage = "http://sawja.inria.fr/"; +in +stdenv.mkDerivation rec { + + name = "ocaml-${pname}-${version}"; + + src = fetchurl { + url = "https://gforge.inria.fr/frs/download.php/33091/${pname}-${version}.tar.bz2"; + sha256 = "0i8qgqkw9vgj6k2g6npss268ivxdkzx5qj2a52jbd8ih59rn68cm"; + }; + + buildInputs = [ which perl ocaml findlib javalib ]; + + patches = [ ./configure.sh.patch ./Makefile.config.example.patch ]; + + createFindlibDestdir = true; + + configureScript = "./configure.sh"; + dontAddPrefix = "true"; + + propagatedBuildInputs = [ javalib ]; + + meta = { + description = "A library written in OCaml, relying on Javalib to provide a high level representation of Java bytecode programs"; + homepage = "${webpage}"; + license = stdenv.lib.licenses.gpl3Plus; + platforms = ocaml.meta.platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/uucd/default.nix b/pkgs/development/ocaml-modules/uucd/default.nix new file mode 100644 index 00000000000..1d0f5c6cd50 --- /dev/null +++ b/pkgs/development/ocaml-modules/uucd/default.nix @@ -0,0 +1,39 @@ +{stdenv, fetchurl, ocaml, findlib, opam, xmlm}: +let + pname = "uucd"; + version = "2.0.0"; + webpage = "http://erratique.ch/software/${pname}"; + ocaml_version = (builtins.parseDrvName ocaml.name).version; +in +stdenv.mkDerivation rec { + + name = "ocaml-${pname}-${version}"; + + src = fetchurl { + url = "${webpage}/releases/${pname}-${version}.tbz"; + sha256 = "12lbrrdjwdxfa99pbg344dfkj51lr5d2ispcj7d7lwsqyxy6h57i"; + }; + + buildInputs = [ ocaml findlib opam xmlm ]; + + createFindlibDestdir = true; + + unpackCmd = "tar xjf $src"; + + buildPhase = "ocaml ./pkg/build.ml native=true native-dynlink=true"; + + installPhase = '' + opam-installer --script --prefix=$out ${pname}.install > install.sh + sh install.sh + ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/ + ''; + + propagatedBuildInputs = [ xmlm ]; + + meta = { + description = "An OCaml module to decode the data of the Unicode character database from its XML representation"; + homepage = "${webpage}"; + platforms = ocaml.meta.platforms; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix new file mode 100644 index 00000000000..c807bbd4463 --- /dev/null +++ b/pkgs/development/ocaml-modules/uunf/default.nix @@ -0,0 +1,37 @@ +{stdenv, fetchurl, ocaml, findlib, opam}: +let + pname = "uunf"; + version = "0.9.3"; + webpage = "http://erratique.ch/software/${pname}"; + ocaml_version = (builtins.parseDrvName ocaml.name).version; +in +stdenv.mkDerivation rec { + + name = "ocaml-${pname}-${version}"; + + src = fetchurl { + url = "${webpage}/releases/${pname}-${version}.tbz"; + sha256 = "16cgjy1m0m61srv1pmlc3gr0y40kd4724clvpagdnz68raz4zmn0"; + }; + + buildInputs = [ ocaml findlib opam ]; + + createFindlibDestdir = true; + + unpackCmd = "tar xjf $src"; + + buildPhase = "./pkg/build true false"; + + installPhase = '' + opam-installer --script --prefix=$out ${pname}.install > install.sh + sh install.sh + ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/ + ''; + + meta = { + description = "An OCaml module for normalizing Unicode text"; + homepage = "${webpage}"; + platforms = ocaml.meta.platforms; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix new file mode 100644 index 00000000000..862236c169b --- /dev/null +++ b/pkgs/development/ocaml-modules/uutf/default.nix @@ -0,0 +1,37 @@ +{stdenv, fetchurl, ocaml, findlib, opam}: +let + pname = "uutf"; + version = "0.9.3"; + webpage = "http://erratique.ch/software/${pname}"; + ocaml_version = (builtins.parseDrvName ocaml.name).version; +in +stdenv.mkDerivation rec { + + name = "ocaml-${pname}-${version}"; + + src = fetchurl { + url = "${webpage}/releases/${pname}-${version}.tbz"; + sha256 = "0xvq20knmq25902ijpbk91ax92bkymsqkbfklj1537hpn64lydhz"; + }; + + buildInputs = [ ocaml findlib opam ]; + + createFindlibDestdir = true; + + unpackCmd = "tar xjf $src"; + + buildPhase = "./pkg/build true"; + + installPhase = '' + opam-installer --script --prefix=$out ${pname}.install > install.sh + sh install.sh + ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/ + ''; + + meta = { + description = "Non-blocking streaming Unicode codec for OCaml"; + homepage = "${webpage}"; + platforms = ocaml.meta.platforms; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix new file mode 100644 index 00000000000..bd19ab716f6 --- /dev/null +++ b/pkgs/development/ocaml-modules/xmlm/default.nix @@ -0,0 +1,37 @@ +{stdenv, fetchurl, ocaml, findlib, opam}: +let + pname = "xmlm"; + version = "1.2.0"; + webpage = "http://erratique.ch/software/${pname}"; + ocaml_version = (builtins.parseDrvName ocaml.name).version; +in +stdenv.mkDerivation rec { + + name = "ocaml-${pname}-${version}"; + + src = fetchurl { + url = "${webpage}/releases/${pname}-${version}.tbz"; + sha256 = "1jywcrwn5z3gkgvicr004cxmdaqfmq8wh72f81jqz56iyn5024nh"; + }; + + buildInputs = [ ocaml findlib opam ]; + + createFindlibDestdir = true; + + unpackCmd = "tar xjf $src"; + + buildPhase = "./pkg/build true"; + + installPhase = '' + opam-installer --script --prefix=$out ${pname}.install > install.sh + sh install.sh + ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/ + ''; + + meta = { + description = "An OCaml streaming codec to decode and encode the XML data format"; + homepage = "${webpage}"; + platforms = ocaml.meta.platforms; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/btrees_interger_overflow.patch b/pkgs/development/python-modules/btrees_interger_overflow.patch new file mode 100644 index 00000000000..a05c7bd6b3c --- /dev/null +++ b/pkgs/development/python-modules/btrees_interger_overflow.patch @@ -0,0 +1,146 @@ +From be19c1f32e4d430092c029f17984f0087a2b2087 Mon Sep 17 00:00:00 2001 +From: Jim Fulton <jim@zope.com> +Date: Mon, 19 May 2014 19:52:43 -0400 +Subject: [PATCH 1/2] Fixed: integer overflow on 32-bit machines wasn't + detected correctly under Python 3. + +--- + BTrees/intkeymacros.h | 7 ++++--- + BTrees/intvaluemacros.h | 3 ++- + BTrees/tests/testBTrees.py | 11 +++++++++-- + BTrees/tests/test_IIBTree.py | 2 ++ + CHANGES.rst | 2 ++ + 5 files changed, 19 insertions(+), 6 deletions(-) + +diff --git a/BTrees/intkeymacros.h b/BTrees/intkeymacros.h +index d439aa0..f9244b5 100644 +--- a/BTrees/intkeymacros.h ++++ b/BTrees/intkeymacros.h +@@ -19,9 +19,10 @@ + #define KEY_CHECK INT_CHECK + #define COPY_KEY_TO_OBJECT(O, K) O=INT_FROM_LONG(K) + #define COPY_KEY_FROM_ARG(TARGET, ARG, STATUS) \ +- if (INT_CHECK(ARG)) { \ +- long vcopy = INT_AS_LONG(ARG); \ +- if ((int)vcopy != vcopy) { \ ++ if (INT_CHECK(ARG)) { \ ++ long vcopy = INT_AS_LONG(ARG); \ ++ if (PyErr_Occurred()) { (STATUS)=0; (TARGET)=0; } \ ++ else if ((int)vcopy != vcopy) { \ + PyErr_SetString(PyExc_TypeError, "integer out of range"); \ + (STATUS)=0; (TARGET)=0; \ + } \ +diff --git a/BTrees/intvaluemacros.h b/BTrees/intvaluemacros.h +index b77a5c9..3072eea 100644 +--- a/BTrees/intvaluemacros.h ++++ b/BTrees/intvaluemacros.h +@@ -23,7 +23,8 @@ + #define COPY_VALUE_FROM_ARG(TARGET, ARG, STATUS) \ + if (INT_CHECK(ARG)) { \ + long vcopy = INT_AS_LONG(ARG); \ +- if ((int)vcopy != vcopy) { \ ++ if (PyErr_Occurred()) { (STATUS)=0; (TARGET)=0; } \ ++ else if ((int)vcopy != vcopy) { \ + PyErr_SetString(PyExc_TypeError, "integer out of range"); \ + (STATUS)=0; (TARGET)=0; \ + } \ +diff --git a/BTrees/tests/testBTrees.py b/BTrees/tests/testBTrees.py +index 50f5b43..31d641d 100644 +--- a/BTrees/tests/testBTrees.py ++++ b/BTrees/tests/testBTrees.py +@@ -11,8 +11,11 @@ + # FOR A PARTICULAR PURPOSE + # + ############################################################################## ++import sys + import unittest + ++python3 = sys.version_info >= (3, ) ++ + from BTrees.tests.common import permutations + + +@@ -451,8 +454,12 @@ def test32(self): + # the characteristics change to match the 64 bit version, please + # feel free to change. + big = BTrees.family32.maxint + 1 +- self.assertRaises(TypeError, s.insert, big) +- self.assertRaises(TypeError, s.insert, BTrees.family32.minint - 1) ++ if python3: ++ expected_exception = OverflowError ++ else: ++ expected_exception = TypeError ++ self.assertRaises(expected_exception, s.insert, ++ BTrees.family32.minint - 1) + self.check_pickling(BTrees.family32) + + def test64(self): +diff --git a/BTrees/tests/test_IIBTree.py b/BTrees/tests/test_IIBTree.py +index 72e95b2..fe776b8 100644 +--- a/BTrees/tests/test_IIBTree.py ++++ b/BTrees/tests/test_IIBTree.py +@@ -113,6 +113,8 @@ def trial(i): + i = int(i) + try: + b[i] = 0 ++ except OverflowError: ++ self.assertRaises(OverflowError, b.__setitem__, 0, i) + except TypeError: + self.assertRaises(TypeError, b.__setitem__, 0, i) + else: +diff --git a/CHANGES.rst b/CHANGES.rst +index 4696be3..e3869ff 100644 +--- a/CHANGES.rst ++++ b/CHANGES.rst +@@ -1,6 +1,8 @@ + ``BTrees`` Changelog + ==================== + ++- Fixed: integer overflow on 32-bit machines wasn't detected correctly ++ under Python 3. + + 4.0.9 (unreleased) + ------------------ +-- +2.0.4 + + +From 11a51d2a12bb9904e96349ff86e78e24a0ebe51a Mon Sep 17 00:00:00 2001 +From: Jim Fulton <jim@zope.com> +Date: Wed, 21 May 2014 07:33:06 -0400 +Subject: [PATCH 2/2] added back test mistakedly removed. + +We have to check both TypeError and OverflowError. On Python3 32-bit, +we'll get an OverflowError, otherwise, we get type error. +--- + BTrees/tests/testBTrees.py | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/BTrees/tests/testBTrees.py b/BTrees/tests/testBTrees.py +index 31d641d..d9be43a 100644 +--- a/BTrees/tests/testBTrees.py ++++ b/BTrees/tests/testBTrees.py +@@ -453,13 +453,13 @@ def test32(self): + # this next bit illustrates an, um, "interesting feature". If + # the characteristics change to match the 64 bit version, please + # feel free to change. +- big = BTrees.family32.maxint + 1 +- if python3: +- expected_exception = OverflowError +- else: +- expected_exception = TypeError +- self.assertRaises(expected_exception, s.insert, +- BTrees.family32.minint - 1) ++ try: s.insert(BTrees.family32.maxint + 1) ++ except (TypeError, OverflowError): pass ++ else: self.assert_(False) ++ ++ try: s.insert(BTrees.family32.minint - 1) ++ except (TypeError, OverflowError): pass ++ else: self.assert_(False) + self.check_pickling(BTrees.family32) + + def test64(self): +-- +2.0.4 + diff --git a/pkgs/development/python-modules/ecdsa/default.nix b/pkgs/development/python-modules/ecdsa/default.nix index f668f3c6ac3..a07eceb45aa 100644 --- a/pkgs/development/python-modules/ecdsa/default.nix +++ b/pkgs/development/python-modules/ecdsa/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { meta = { homepage = "http://github.com/warner/python-ecdsa"; - description = "pure-python ECDSA signature/verification"; + description = "Pure-python ECDSA signature/verification"; license = stdenv.lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 75fb974e735..4c9c53aab83 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -34,7 +34,10 @@ # The difference is that `pythonPath' is not propagated to the user # environment. This is preferrable for programs because it doesn't # pollute the user environment. -, pythonPath ? [] +, pythonPath ? [] + +# used to disable derivation, useful for specific python versions +, disabled ? false , meta ? {} @@ -46,8 +49,9 @@ , ... } @ attrs: + # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. -python.stdenv.mkDerivation (attrs // { +if disabled then throw "${name} not supported for interpreter ${python.executable}" else python.stdenv.mkDerivation (attrs // { inherit doCheck; name = namePrefix + name; diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix new file mode 100644 index 00000000000..9ab68ac4cd2 --- /dev/null +++ b/pkgs/development/python-modules/h5py/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, python, buildPythonPackage +, numpy, hdf5, cython +, mpiSupport ? false, mpi4py ? null, mpi ? null }: + +assert mpiSupport == hdf5.mpiSupport; +assert mpiSupport -> mpi != null + && mpi4py != null + && mpi == mpi4py.mpi + && mpi == hdf5.mpi + ; + +with stdenv.lib; + +buildPythonPackage rec { + name = "h5py-2.3.1"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/h/h5py/${name}.tar.gz"; + md5 = "8f32f96d653e904d20f9f910c6d9dd91"; + }; + + setupPyBuildFlags = [ "--hdf5=${hdf5}" ] + ++ optional mpiSupport "--mpi" + ; + setupPyInstallFlags = setupPyBuildFlags; + + preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else ""; + + buildInputs = [ hdf5 cython ] + ++ optional mpiSupport mpi + ; + propagatedBuildInputs = [ numpy ] + ++ optional mpiSupport mpi4py + ; + + meta = { + description = " + The h5py package is a Pythonic interface to the HDF5 binary data format. + "; + homepage = "http://www.h5py.org/"; + license = stdenv.lib.licenses.bsd2; + }; +} diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix new file mode 100644 index 00000000000..74d46def907 --- /dev/null +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, python, buildPythonPackage, mpi, openssh }: + +buildPythonPackage rec { + name = "mpi4py-1.3.1"; + + src = fetchurl { + url = "https://bitbucket.org/mpi4py/mpi4py/downloads/${name}.tar.gz"; + sha256 = "e7bd2044aaac5a6ea87a87b2ecc73b310bb6efe5026031e33067ea3c2efc3507"; + }; + + passthru = { + inherit mpi; + }; + + configurePhase = ""; + + 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" + + # --install-lib: + # sometimes packages specify where files should be installed outside the usual + # python lib prefix, we override that back so all infrastructure (setup hooks) + # work as expected + ''; + + setupPyBuildFlags = ["--mpicc=${mpi}/bin/mpicc"]; + + buildInputs = [ mpi ]; + # Requires openssh for tests. Tests of dependent packages will also fail, + # if openssh is not present. E.g. h5py with mpi support. + propagatedBuildInputs = [ openssh ]; + + meta = { + description = " + Provides Python bindings for the Message Passing Interface standard. + "; + homepage = "http://code.google.com/p/mpi4py/"; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/numeric/default.nix b/pkgs/development/python-modules/numeric/default.nix index e97b2a5f1a4..0d6d5b0ffed 100644 --- a/pkgs/development/python-modules/numeric/default.nix +++ b/pkgs/development/python-modules/numeric/default.nix @@ -23,7 +23,7 @@ let version = "24.2"; in # FIXME: Run the tests. meta = { - description = "Numeric, a Python module for high-performance, numeric computing"; + description = "A Python module for high-performance, numeric computing"; longDescription = '' Numeric is a Python module for high-performance, numeric @@ -37,4 +37,4 @@ let version = "24.2"; in homepage = http://people.csail.mit.edu/jrennie/python/numeric/; }; - } \ No newline at end of file + } diff --git a/pkgs/development/python-modules/pil/default.nix b/pkgs/development/python-modules/pil/default.nix deleted file mode 100644 index 35a1e913bf7..00000000000 --- a/pkgs/development/python-modules/pil/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ fetchurl, stdenv, python, buildPythonPackage, libjpeg, zlib, freetype }: - -let version = "1.1.7"; in - -buildPythonPackage { - name = "imaging-${version}"; - - src = fetchurl { - url = "http://effbot.org/downloads/Imaging-${version}.tar.gz"; - sha256 = "04aj80jhfbmxqzvmq40zfi4z3cw6vi01m3wkk6diz3lc971cfnw9"; - }; - - buildInputs = [ python libjpeg zlib freetype ]; - - doCheck = true; - - preConfigure = '' - sed -i "setup.py" \ - -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = libinclude("${freetype}")|g ; - s|^JPEG_ROOT =.*$|JPEG_ROOT = libinclude("${libjpeg}")|g ; - s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${zlib}")|g ;' - ''; - - checkPhase = "python selftest.py"; - buildPhase = "python setup.py build_ext -i"; - - postInstall = '' - cd "$out"/lib/python*/site-packages - ln -s $PWD PIL - ''; - - meta = { - homepage = http://www.pythonware.com/products/pil/; - description = "The Python Imaging Library (PIL)"; - - longDescription = '' - The Python Imaging Library (PIL) adds image processing - capabilities to your Python interpreter. This library - supports many file formats, and provides powerful image - processing and graphics capabilities. - ''; - - license = "http://www.pythonware.com/products/pil/license.htm"; - }; -} diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix index c8f0f74c1ff..59bd9affef6 100644 --- a/pkgs/development/python-modules/pycrypto/default.nix +++ b/pkgs/development/python-modules/pycrypto/default.nix @@ -9,10 +9,9 @@ buildPythonPackage rec { sha256 = "0g0ayql5b9mkjam8hym6zyg6bv77lbh66rv1fyvgqb17kfc1xkpj"; }; - buildInputs = [ gmp ]; - - doCheck = !stdenv.isDarwin; # error: AF_UNIX path too long + buildInputs = stdenv.lib.optional (!python.isPypy or false) gmp; # optional for pypy + doCheck = !(python.isPypy or stdenv.isDarwin); # error: AF_UNIX path too long meta = { homepage = "http://www.pycrypto.org/"; diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix index 7d3804d264a..60aa65323d7 100644 --- a/pkgs/development/python-modules/pygtk/default.nix +++ b/pkgs/development/python-modules/pygtk/default.nix @@ -1,8 +1,10 @@ { stdenv, fetchurl, python, pkgconfig, gtk, pygobject, pycairo -, buildPythonPackage, libglade ? null }: +, buildPythonPackage, libglade ? null, isPy3k }: buildPythonPackage rec { name = "pygtk-2.24.0"; + + disabled = isPy3k; src = fetchurl { url = "mirror://gnome/sources/pygtk/2.24/${name}.tar.bz2"; diff --git a/pkgs/development/python-modules/pyuv-external-libuv.patch b/pkgs/development/python-modules/pyuv-external-libuv.patch new file mode 100644 index 00000000000..33539d9b4b2 --- /dev/null +++ b/pkgs/development/python-modules/pyuv-external-libuv.patch @@ -0,0 +1,27 @@ +diff --git a/setup.py b/setup.py +index ec0caac..2c1fdb6 100644 +--- a/setup.py ++++ b/setup.py +@@ -6,7 +6,6 @@ try: + from setuptools import setup, Extension + except ImportError: + from distutils.core import setup, Extension +-from setup_libuv import libuv_build_ext, libuv_sdist + + + __version__ = "0.11.5" +@@ -32,12 +31,11 @@ setup(name = "pyuv", + "Programming Language :: Python :: 3.3", + "Programming Language :: Python :: 3.4" + ], +- cmdclass = {'build_ext': libuv_build_ext, +- 'sdist' : libuv_sdist}, + ext_modules = [Extension('pyuv', + sources = ['src/pyuv.c'], ++ libraries = ['uv'], + define_macros=[('MODULE_VERSION', __version__), +- ('LIBUV_REVISION', libuv_build_ext.libuv_revision)] ++ ('LIBUV_REVISION', 'unknown')] + )] + ) + diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index 89a17d28a1b..10cdf01103a 100644 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ b/pkgs/development/tools/analysis/lcov/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "LCOV, a code coverage tool that enhances GNU gcov"; + description = "Code coverage tool that enhances GNU gcov"; longDescription = '' LCOV is an extension of GCOV, a GNU tool which provides information diff --git a/pkgs/development/tools/analysis/sparse/default.nix b/pkgs/development/tools/analysis/sparse/default.nix index 6d0e28f0ab2..6898b7eee54 100644 --- a/pkgs/development/tools/analysis/sparse/default.nix +++ b/pkgs/development/tools/analysis/sparse/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "Sparse, a semantic parser for C"; + description = "Semantic parser for C"; homepage = "https://git.kernel.org/cgit/devel/sparse/sparse.git/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 5ffc287d114..aaeee026d0a 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.valgrind.org/; - description = "Valgrind, a debugging and profiling tool suite"; + description = "Debugging and profiling tool suite"; longDescription = '' Valgrind is an award-winning instrumentation framework for diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index b7316fc17c4..a4863d12b5c 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip jdk makeWrapper ]; meta = { - description = "Gradle is an enterprise-grade build system"; + description = "Enterprise-grade build system"; longDescription = '' Gradle is a build system which offers you ease, power and freedom. You can choose the balance for yourself. It has powerful multi-project diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 54509178b1a..50f2037b271 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = { license = stdenv.lib.licenses.gpl2Plus; homepage = "http://doxygen.org/"; - description = "Doxygen, a source code documentation generator tool"; + description = "Source code documentation generator tool"; longDescription = '' Doxygen is a documentation system for C++, C, Java, Objective-C, diff --git a/pkgs/development/tools/documentation/haddock/2.14.3.nix b/pkgs/development/tools/documentation/haddock/2.14.3.nix index a16994b1f2e..7ce4782bb60 100644 --- a/pkgs/development/tools/documentation/haddock/2.14.3.nix +++ b/pkgs/development/tools/documentation/haddock/2.14.3.nix @@ -12,7 +12,7 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; testDepends = [ Cabal deepseq filepath hspec QuickCheck ]; - doCheck = false; + preCheck = "unset GHC_PACKAGE_PATH"; meta = { homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; diff --git a/pkgs/development/tools/haskell/cabal-bounds/default.nix b/pkgs/development/tools/haskell/cabal-bounds/default.nix index 213ba6f9d13..97dac34af3b 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.4"; - sha256 = "00vj6ca9liqlqg69d4ziacsxz6x9365sbyc1ag6g18bhibyinsh2"; + version = "0.8.5"; + sha256 = "19lai2gdxs76mrvcz77sjsx7hh87cf1f4qmy7z1zcd130z11q04a"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 978ebde7e29..db7e472934c 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -1,15 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, Cabal, doctest, filepath, hackageDb, HTTP, mtl, regexPosix +{ cabal, Cabal, doctest, filepath, hackageDb, mtl, regexPosix +, transformers }: cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.68"; - sha256 = "0w9ayvr3ljfxgi17yaayqvyxflbgf7b5245pc3m011lp3cfnj849"; + version = "1.69"; + sha256 = "0430086lh1h7w8wxc42aqrdjb8i12vz8m0jr1q2c45h3k6brb5r5"; isLibrary = false; isExecutable = true; - buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; + buildDepends = [ + Cabal filepath hackageDb mtl regexPosix transformers + ]; testDepends = [ doctest ]; doCheck = self.stdenv.lib.versionOlder "7.6" self.ghc.version; meta = { diff --git a/pkgs/development/tools/java/fastjar/default.nix b/pkgs/development/tools/java/fastjar/default.nix index c8bb94412ca..e5a9ca50ce9 100644 --- a/pkgs/development/tools/java/fastjar/default.nix +++ b/pkgs/development/tools/java/fastjar/default.nix @@ -14,7 +14,7 @@ let version = "0.94"; in doCheck = true; meta = { - description = "FastJar, a fast Java archiver written in C"; + description = "Fast Java archiver written in C"; longDescription = '' Fastjar is a version of Sun's `jar' utility, written entirely in C, and diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 005b493836f..316089fa7c6 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { postFixup = "ln -s $out/bin $dev/bin"; # tools needed for development meta = { - description = "GNU Binutils, tools for manipulating binaries (linker, assembler, etc.)"; + description = "Tools for manipulating binaries (linker, assembler, etc.)"; longDescription = '' The GNU Binutils are a collection of binary tools. The main diff --git a/pkgs/development/tools/misc/bossa/bin2c.c b/pkgs/development/tools/misc/bossa/bin2c.c new file mode 100644 index 00000000000..f0b915de540 --- /dev/null +++ b/pkgs/development/tools/misc/bossa/bin2c.c @@ -0,0 +1,122 @@ +// bin2c.c +// +// convert a binary file into a C source vector +// +// THE "BEER-WARE LICENSE" (Revision 3.1415): +// sandro AT sigala DOT it wrote this file. As long as you retain this notice you can do +// whatever you want with this stuff. If we meet some day, and you think this stuff is +// worth it, you can buy me a beer in return. Sandro Sigala +// +// syntax: bin2c [-c] [-z] <input_file> <output_file> +// +// -c add the "const" keyword to definition +// -z terminate the array with a zero (useful for embedded C strings) +// +// examples: +// bin2c -c myimage.png myimage_png.cpp +// bin2c -z sometext.txt sometext_txt.cpp + +#include <ctype.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#ifndef PATH_MAX +#define PATH_MAX 1024 +#endif + +int useconst = 0; +int zeroterminated = 0; + +int myfgetc(FILE *f) +{ + int c = fgetc(f); + if (c == EOF && zeroterminated) + { + zeroterminated = 0; + return 0; + } + return c; +} + +void process(const char *ifname, const char *ofname) +{ + FILE *ifile, *ofile; + ifile = fopen(ifname, "rb"); + if (ifile == NULL) + { + fprintf(stderr, "cannot open %s for reading\n", ifname); + exit(1); + } + ofile = fopen(ofname, "wb"); + if (ofile == NULL) + { + fprintf(stderr, "cannot open %s for writing\n", ofname); + exit(1); + } + char buf[PATH_MAX], *p; + const char *cp; + if ((cp = strrchr(ifname, '/')) != NULL) + { + ++cp; + } else { + if ((cp = strrchr(ifname, '\\')) != NULL) + ++cp; + else + cp = ifname; + } + strcpy(buf, cp); + for (p = buf; *p != '\0'; ++p) + { + if (!isalnum(*p)) + *p = '_'; + } + fprintf(ofile, "static %sunsigned char %s[] = {\n", useconst ? "const " : "", buf); + int c, col = 1; + while ((c = myfgetc(ifile)) != EOF) + { + if (col >= 78 - 6) + { + fputc('\n', ofile); + col = 1; + } + fprintf(ofile, "0x%.2x, ", c); + col += 6; + } + fprintf(ofile, "\n};\n"); + + fclose(ifile); + fclose(ofile); +} + +void usage(void) +{ + fprintf(stderr, "usage: bin2c [-cz] <input_file> <output_file>\n"); + exit(1); +} + +int main(int argc, char **argv) +{ + while (argc > 3) + { + if (!strcmp(argv[1], "-c")) + { + useconst = 1; + --argc; + ++argv; + } else if (!strcmp(argv[1], "-z")) + { + zeroterminated = 1; + --argc; + ++argv; + } else { + usage(); + } + } + if (argc != 3) + { + usage(); + } + process(argv[1], argv[2]); + return 0; +} diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/tools/misc/bossa/default.nix new file mode 100644 index 00000000000..f0b6d81e69e --- /dev/null +++ b/pkgs/development/tools/misc/bossa/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchgit, wxGTK, libX11, readline }: + +let + # BOSSA needs a "bin2c" program to embed images. + # Source taken from: + # http://wiki.wxwidgets.org/Embedding_PNG_Images-Bin2c_In_C + bin2c = stdenv.mkDerivation { + name = "bossa-bin2c"; + src = ./bin2c.c; + unpackPhase = "true"; + buildPhase = ''cc $src -o bin2c''; + installPhase = ''mkdir -p $out/bin; cp bin2c $out/bin/''; + }; + +in +stdenv.mkDerivation rec { + name = "bossa"; + + src = fetchgit { + url = https://github.com/shumatech/BOSSA; + rev = "0f0a41cb1c3a65e909c5c744d8ae664e896a08ac"; /* arduino branch */ + sha256 = "01y8r45fw02rps9q995mv82bxrm6p0mysv4wir5glpagrhnyw7md"; + }; + + nativeBuildInputs = [ bin2c ]; + buildInputs = [ wxGTK libX11 readline ]; + + # Explicitly specify targets so they don't get stripped. + makeFlags = [ "bin/bossac" "bin/bossash" "bin/bossa" ]; + + installPhase = '' + mkdir -p $out/bin + cp bin/bossa{c,sh,} $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "A flash programming utility for Atmel's SAM family of flash-based ARM microcontrollers"; + longDescription = '' + BOSSA is a flash programming utility for Atmel's SAM family of + flash-based ARM microcontrollers. The motivation behind BOSSA is + to create a simple, easy-to-use, open source utility to replace + Atmel's SAM-BA software. BOSSA is an acronym for Basic Open + Source SAM-BA Application to reflect that goal. + ''; + homepage = http://www.shumatech.com/web/products/bossa; + license = licenses.bsd3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix index 53bc8ed78c8..b1322d461ee 100644 --- a/pkgs/development/tools/misc/cflow/default.nix +++ b/pkgs/development/tools/misc/cflow/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU cflow, a tool to analyze the control flow of C programs"; + description = "Tool to analyze the control flow of C programs"; longDescription = '' GNU cflow analyzes a collection of C source files and prints a diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix index 0bf5bbce692..51f5ed6091f 100644 --- a/pkgs/development/tools/misc/coccinelle/default.nix +++ b/pkgs/development/tools/misc/coccinelle/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation { configureFlags = "--enable-release"; meta = { - description = "Coccinelle, a program to apply C code semantic patches"; + description = "Program to apply semantic patches to C code"; longDescription = '' Coccinelle is a program matching and transformation engine which diff --git a/pkgs/development/tools/misc/complexity/default.nix b/pkgs/development/tools/misc/complexity/default.nix index 9f1eca0fa13..a7ae4d17ab1 100644 --- a/pkgs/development/tools/misc/complexity/default.nix +++ b/pkgs/development/tools/misc/complexity/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "GNU Complexity, C code complexity measurement tool"; + description = "C code complexity measurement tool"; longDescription = '' GNU Complexity is a tool designed for analyzing the complexity of C diff --git a/pkgs/development/tools/misc/cppi/default.nix b/pkgs/development/tools/misc/cppi/default.nix index 500129c7c9d..2942408de80 100644 --- a/pkgs/development/tools/misc/cppi/default.nix +++ b/pkgs/development/tools/misc/cppi/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://savannah.gnu.org/projects/cppi/; - description = "GNU cppi, a cpp directive indenter"; + description = "A C preprocessor directive indenter"; longDescription = '' GNU cppi indents C preprocessor directives to reflect their nesting diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix index 3a83b1ba325..223f1968274 100644 --- a/pkgs/development/tools/misc/cscope/default.nix +++ b/pkgs/development/tools/misc/cscope/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "Cscope, a developer's tool for browsing source code"; + description = "A developer's tool for browsing source code"; longDescription = '' Cscope is a developer's tool for browsing source code. It has diff --git a/pkgs/development/tools/misc/ctags/default.nix b/pkgs/development/tools/misc/ctags/default.nix index 80def733cf8..bf13a5daa66 100644 --- a/pkgs/development/tools/misc/ctags/default.nix +++ b/pkgs/development/tools/misc/ctags/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://ctags.sourceforge.net/"; - description = "Exuberant Ctags, a tool for fast source code browsing"; + description = "A tool for fast source code browsing (exuberant ctags)"; license = stdenv.lib.licenses.gpl2Plus; longDescription = '' diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 2b5ced78063..5ee0f64a4e4 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = with stdenv.lib; { - description = "GDB, the GNU Project debugger"; + description = "The GNU Project debugger"; longDescription = '' GDB, the GNU Project debugger, allows you to see what is going diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/development/tools/misc/gengetopt/default.nix index 9926dd6cd33..19e934f884f 100644 --- a/pkgs/development/tools/misc/gengetopt/default.nix +++ b/pkgs/development/tools/misc/gengetopt/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU Gengetopt, a command-line option parser generator"; + description = "Command-line option parser generator"; longDescription = '' GNU Gengetopt program generates a C function that uses getopt_long diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index d6abf8d10bd..b366feb304a 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "GNU GLOBAL source code tag system"; + description = "Source code tag system"; longDescription = '' GNU GLOBAL is a source code tagging system that works the same way diff --git a/pkgs/development/tools/misc/gperf/default.nix b/pkgs/development/tools/misc/gperf/default.nix index e25998e5420..f0fd081ec5f 100644 --- a/pkgs/development/tools/misc/gperf/default.nix +++ b/pkgs/development/tools/misc/gperf/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "GNU gperf, a perfect hash function generator"; + description = "Perfect hash function generator"; longDescription = '' GNU gperf is a perfect hash function generator. For a given diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 23bd35c8739..c4ba7073889 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { - description = "GNU help2man generates man pages from `--help' output"; + description = "Generate man pages from `--help' output"; longDescription = '' help2man produces simple manual pages from the ‘--help’ and diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix index 5eee9ead5d6..262d8aad23b 100644 --- a/pkgs/development/tools/misc/libtool/default.nix +++ b/pkgs/development/tools/misc/libtool/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { dontPatchShebangs = true; meta = { - description = "GNU Libtool, a generic library support script"; + description = "Generic library support script"; longDescription = '' GNU libtool is a generic library support script. Libtool hides diff --git a/pkgs/development/tools/misc/nixbang/default.nix b/pkgs/development/tools/misc/nixbang/default.nix new file mode 100644 index 00000000000..762e6f2c4db --- /dev/null +++ b/pkgs/development/tools/misc/nixbang/default.nix @@ -0,0 +1,20 @@ +{ lib, pythonPackages, fetchgit }: + +let version = "0.1.1"; in +pythonPackages.buildPythonPackage { + name = "nixbang-${version}"; + namePrefix = ""; + + src = fetchgit { + url = "git://github.com/madjar/nixbang.git"; + rev = "refs/tags/${version}"; + sha256 = "1n8jq32r2lzk3g0d95ksfq7vdqciz34jabribrr4hcnz4nlijshf"; + }; + + meta = { + homepage = https://github.com/madjar/nixbang; + description = "A special shebang to run scripts in a nix-shell"; + maintainers = [ lib.maintainers.madjar ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix index 455305be749..1aa9a2c058d 100644 --- a/pkgs/development/tools/misc/sloccount/default.nix +++ b/pkgs/development/tools/misc/sloccount/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "SLOCCount, a set of tools for counting physical Source Lines of Code (SLOC)"; + description = "Set of tools for counting physical Source Lines of Code (SLOC)"; longDescription = '' This is the home page of "SLOCCount", a set of tools for diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index 09978b5ad65..66d6b65453e 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/pkgs/development/tools/misc/swig/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optionalString stdenv.isDarwin "--disable-ccache"; meta = { - description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; + description = "Interface compiler that connects C/C++ code to higher-level languages"; longDescription = '' SWIG is an interface compiler that connects programs written in C and diff --git a/pkgs/development/tools/misc/texinfo/4.13a.nix b/pkgs/development/tools/misc/texinfo/4.13a.nix index 5131d381412..a3155230514 100644 --- a/pkgs/development/tools/misc/texinfo/4.13a.nix +++ b/pkgs/development/tools/misc/texinfo/4.13a.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { #doCheck = true; meta = { - description = "GNU Texinfo, the GNU documentation system"; + description = "The GNU documentation system"; longDescription = '' Texinfo is the official documentation format of the GNU project. diff --git a/pkgs/development/tools/misc/texinfo/5.2.nix b/pkgs/development/tools/misc/texinfo/5.2.nix index 9b7b6139a98..53076476f89 100644 --- a/pkgs/development/tools/misc/texinfo/5.2.nix +++ b/pkgs/development/tools/misc/texinfo/5.2.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/texinfo/"; - description = "GNU Texinfo, the GNU documentation system"; + description = "The GNU documentation system"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix index 22e0d71af4d..300cbbc0a0c 100644 --- a/pkgs/development/tools/ocaml/omake/default.nix +++ b/pkgs/development/tools/ocaml/omake/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { # buildFlags = "world.opt"; meta = { - description = "Omake build system"; + description = "A build system designed for scalability and portability"; homepage = "${webpage}"; license = "GPL"; }; diff --git a/pkgs/development/tools/parsing/bison/2.x.nix b/pkgs/development/tools/parsing/bison/2.x.nix index 5bf5d7c2e8c..f89e7bca5a7 100644 --- a/pkgs/development/tools/parsing/bison/2.x.nix +++ b/pkgs/development/tools/parsing/bison/2.x.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/bison/"; - description = "GNU Bison, a Yacc-compatible parser generator"; + description = "Yacc-compatible parser generator"; license = stdenv.lib.licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index 5947f85343c..49602a23201 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/bison/"; - description = "GNU Bison, a Yacc-compatible parser generator"; + description = "Yacc-compatible parser generator"; license = stdenv.lib.licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index e301fe8431a..6c7b2a4d9ae 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "OProfile, a system-wide profiler for Linux"; + description = "System-wide profiler for Linux"; longDescription = '' OProfile is a system-wide profiler for Linux systems, capable of profiling all running code at low overhead. It consists of a diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 457a5d1dcaa..826ca93aa7d 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://sysprof.com/; - description = "Sysprof, a system-wide profiler for Linux"; + description = "System-wide profiler for Linux"; license = stdenv.lib.licenses.gpl2Plus; longDescription = '' diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix index a0f7922b1aa..15a6985b8bf 100644 --- a/pkgs/development/tools/sqsh/default.nix +++ b/pkgs/development/tools/sqsh/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; meta = { - description = "SQSH is command line tool for querying Sybase/MSSQL databases"; + description = "Command line tool for querying Sybase/MSSQL databases"; longDescription = '' Sqsh (pronounced skwish) is short for SQshelL (pronounced s-q-shell), diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index 84b0da1674c..ca3439df4c4 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -8,7 +8,7 @@ let npmFlags = concatStringsSep " " (map (v: "--${v}") flags); sources = runCommand "node-sources" {} '' - tar --no-same-owner -xf ${nodejs.src} + tar --no-same-owner --no-same-permissions -xf ${nodejs.src} mv *node* $out ''; |