diff options
31 files changed, 554 insertions, 118 deletions
diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix index 8a5a65f8ed09..13990ec49e1b 100644 --- a/pkgs/applications/audio/ardour/ardour3.nix +++ b/pkgs/applications/audio/ardour/ardour3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, alsaLib, aubio, boost, cairomm, curl, fftw +{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, fftw , fftwSinglePrec, flac, glibc, glibmm, gtk, gtkmm, jackaudio , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile @@ -6,17 +6,17 @@ , perl, pkgconfig, python, serd, sord, sratom, suil }: let - # Ardour 3 RC2 - rev = "14092"; + # Ardour 3.0 tag + rev = "79db9422"; in stdenv.mkDerivation { - name = "ardour3-svn-${rev}"; + name = "ardour3"; - src = fetchsvn { - url = http://subversion.ardour.org/svn/ardour2/branches/3.0; + src = fetchgit { + url = git://git.ardour.org/ardour/ardour.git; inherit rev; - sha256 = "1zyy74z3xcsdhrzw4g6y1qm1ai2fl3bgabscl0wn7m1kkscr9nzg"; + sha256 = "cdbe4ca6d4b639fcd66a3d1cf9c2816b4755655c9d81bdd2417263f413aa7096"; }; buildInputs = diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index 1bfb2df2745c..2ea37e2bd237 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { name = "cmus-${version}"; - version = "2.3.3"; - - configurePhase = "./configure prefix=$out"; - - buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis mpc mp4v2 ]; + version = "2.5.0"; src = fetchurl { url = "mirror://sourceforge/cmus/cmus-v${version}.tar.bz2"; - sha256 = "13hc5d7h2ayjwnip345hc59rpjj9fgrp1i5spjw3s14prdqr733v"; + sha256 = "1pwd3jifv12yr0yr77hsv5c9y8ay6kn2b5a3s5i8v2c882vgl890"; }; + configurePhase = "./configure prefix=$out"; + + buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis mpc mp4v2 ]; + meta = { description = "cmus is a small, fast and powerful console music player for Linux and *BSD"; homepage = http://cmus.sourceforge.net; diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix new file mode 100644 index 000000000000..99e1ec1c169b --- /dev/null +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, pkgconfig, gtk2, libpng, exiv2, lcms +, intltool, gettext, shared_mime_info, glib, gdk_pixbuf, perl}: + +stdenv.mkDerivation rec { + name = "viewnior-1.3"; + + src = fetchurl { + url = "http://cloud.github.com/downloads/xsisqox/Viewnior/${name}.tar.gz"; + sha256 = "46c97c1a85361519b42fe008cfb8911e66f709f3a3a988c11047ab3726889f10"; + }; + + buildInputs = + [ pkgconfig gtk2 libpng exiv2 lcms intltool gettext + shared_mime_info glib gdk_pixbuf perl + ]; + + meta = { + description = "Viewnior is a fast and simple image viewer for GNU/Linux"; + longDescription = + '' Viewnior is insipred by big projects like Eye of Gnome, because of it's + usability and richness,and by GPicView, because of it's lightweight design and + minimal interface. So here comes Viewnior - small and light, with no compromise + with the quality of it's functions. The program is made with better integration + in mind (follows Gnome HIG2). + ''; + + license = "GPLv3"; + + homepage = http://xsisqox.github.com/Viewnior; + + maintainers = [ stdenv.lib.maintainers.smironov ]; + + platforms = stdenv.lib.platforms.gnu; + }; +} diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 9334ff4bd41b..1618042364e8 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -1,5 +1,8 @@ { stdenv, fetchurl, python, perl, ncurses, x11, bzip2, zlib, openssl -, spidermonkey, guile, gpm }: +, spidermonkey, gpm +, enableGuile ? true, guile ? null }: + +assert enableGuile -> guile != null; stdenv.mkDerivation rec { name = "elinks-0.12pre5"; @@ -11,14 +14,15 @@ stdenv.mkDerivation rec { patches = [ ./gc-init.patch ]; - buildInputs = [ python perl ncurses x11 bzip2 zlib openssl spidermonkey guile gpm ]; + buildInputs = [ python perl ncurses x11 bzip2 zlib openssl spidermonkey gpm ] + ++ stdenv.lib.optional enableGuile guile; configureFlags = '' - --enable-finger --enable-html-highlight --with-guile + --enable-finger --enable-html-highlight --with-perl --with-python --enable-gopher --enable-cgi --enable-bittorrent --enable-nntp --with-openssl=${openssl} - ''; + '' + stdenv.lib.optionalString enableGuile " --with-guile"; crossAttrs = { propagatedBuildInputs = [ ncurses.crossDrv zlib.crossDrv openssl.crossDrv ]; diff --git a/pkgs/applications/networking/browsers/firefox/19.0.nix b/pkgs/applications/networking/browsers/firefox/19.0.nix index 1881c7d7af63..7a65635849e2 100644 --- a/pkgs/applications/networking/browsers/firefox/19.0.nix +++ b/pkgs/applications/networking/browsers/firefox/19.0.nix @@ -15,9 +15,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "19.0.1"; + firefoxVersion = "19.0.2"; - xulVersion = "19.0.1"; # this attribute is used by other packages + xulVersion = "19.0.2"; # this attribute is used by other packages src = fetchurl { @@ -27,7 +27,7 @@ rec { # Fall back to this url for versions not available at releases.mozilla.org. "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" ]; - sha1 = "6a3a965c165ceda8c5ba038e9fe0136fbd1690ff"; + sha1 = "d108d356225379a86d69a4906c706289135f6342"; }; commonConfigureFlags = diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 147d5f491517..1477cd82cf44 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "notmuch-0.15"; + name = "notmuch-0.15.2"; src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "07bi87jxfh761b4fvcwf4svlksd7jlznnzhnsp983gdldkabg60q"; + sha256 = "03cwylm0y9xld0hn753v0hn62f96nagdmzxv8jlz8vdbh9iszs56"; }; buildInputs = [ bash emacs gdb glib gmime gnupg1 pkgconfig talloc xapian ]; diff --git a/pkgs/applications/networking/p2p/transmission/2.60.nix b/pkgs/applications/networking/p2p/transmission/2.60.nix new file mode 100644 index 000000000000..c59fddf6364b --- /dev/null +++ b/pkgs/applications/networking/p2p/transmission/2.60.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, pkgconfig, openssl, curl, intltool, libevent, + file, inotifyTools, gtk ? null }: + +stdenv.mkDerivation rec { + name = "transmission-2.60"; # transmission >= 2.61 requires gtk3 + + src = fetchurl { + url = "http://download.transmissionbt.com/files/${name}.tar.xz"; + sha256 = "1ramdliyy8j7qqpkxg643lda11ynxwfhq6qcs31fr3h9x72l0rg4"; + }; + + buildInputs = [ pkgconfig openssl curl intltool libevent + file inotifyTools gtk ]; + + preConfigure = '' + sed -i -e 's|/usr/bin/file|${file}/bin/file|g' configure + ''; + + postInstall = '' + rm -f $out/share/icons/hicolor/icon-theme.cache + ''; + + meta = { + description = "A fast, easy and free BitTorrent client"; + longDescription = '' + Transmission is a BitTorrent client which features a simple interface + on top of a cross-platform back-end. + Feature spotlight: + * Uses fewer resources than other clients + * Native Mac, GTK+ and Qt GUI clients + * Daemon ideal for servers, embedded systems, and headless use + * All these can be remote controlled by Web and Terminal clients + * Bluetack (PeerGuardian) blocklists with automatic updates + * Full encryption, DHT, and PEX support + ''; + homepage = http://www.transmissionbt.com/; + license = [ "GPLv2" ]; + maintainers = [ stdenv.lib.maintainers.astsmtl ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index c59fddf6364b..2c6106d13040 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -1,21 +1,27 @@ -{ stdenv, fetchurl, pkgconfig, openssl, curl, intltool, libevent, - file, inotifyTools, gtk ? null }: +{ stdenv, fetchurl, pkgconfig, openssl, curl, intltool, libevent +, file, inotifyTools +, enableGtk ? false, gtk ? null }: + +assert enableGtk -> gtk != null; stdenv.mkDerivation rec { - name = "transmission-2.60"; # transmission >= 2.61 requires gtk3 + name = "transmission-2.77"; # transmission >= 2.61 requires gtk3 src = fetchurl { url = "http://download.transmissionbt.com/files/${name}.tar.xz"; - sha256 = "1ramdliyy8j7qqpkxg643lda11ynxwfhq6qcs31fr3h9x72l0rg4"; + sha256 = "1phzhj4wds6r2ziclva1b5l6l9xjsx5ji7s3m4xia44aq4znbcam"; }; buildInputs = [ pkgconfig openssl curl intltool libevent - file inotifyTools gtk ]; + file inotifyTools ] + ++ stdenv.lib.optional enableGtk gtk; preConfigure = '' sed -i -e 's|/usr/bin/file|${file}/bin/file|g' configure ''; + configureFlags = stdenv.lib.optionalString enableGtk "--with-gtk"; + postInstall = '' rm -f $out/share/icons/hicolor/icon-theme.cache ''; diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 94ac84f838c2..f8e4e16655aa 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,18 +1,18 @@ -{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutil, bison, - xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, flex, +{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutil, + xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, libXcursor, coreutils, perl }: stdenv.mkDerivation rec { name = "i3-${version}"; - version = "4.4"; + version = "4.5"; src = fetchurl { url = "http://i3wm.org/downloads/${name}.tar.bz2"; - sha256 = "06s8gzcxxh06zp1586kp4bxaj8yj5i9jacwg0nizbmmnx94mg1wr"; + sha256 = "1kiffcbvvjljqchw9ffgy9s8f9z06i8805jvjas58q5i2yxl5kcy"; }; - buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil bison xcbutilwm - libstartup_notification libX11 pcre libev yajl flex libXcursor perl ]; + buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil xcbutilwm + libstartup_notification libX11 pcre libev yajl libXcursor perl ]; patchPhase = '' sed -i -e '/^# Pango/,/^$/d' common.mk diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index 60db6188f70c..76fc487ba4ab 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -2,11 +2,11 @@ }: stdenv.mkDerivation rec { - name = "i3status-2.6"; + name = "i3status-2.7"; src = fetchurl { url = "http://i3wm.org/i3status/${name}.tar.bz2"; - sha256 = "e7e710cc271887bcd22757269e1b00a5618fb53abdb3455140116b3d38797bce"; + sha256 = "0cm6fhsc7hzsqni8pwhjl2l0rfd458paabn54cgzqnmwwdflwgq7"; }; buildInputs = [ confuse yajl alsaLib wirelesstools ]; diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 9d9bdb2033e3..1251866252c5 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1367,22 +1367,22 @@ rec { }; debian60i386 = { - name = "debian-6.0.6-squeeze-i386"; - fullName = "Debian 6.0.6 Squeeze (i386)"; + name = "debian-6.0.7-squeeze-i386"; + fullName = "Debian 6.0.7 Squeeze (i386)"; packagesList = fetchurl { url = mirror://debian/dists/squeeze/main/binary-i386/Packages.bz2; - sha256 = "18c0473jacd877nkky1x21dkmp4992d8qra6wj07sq0yz5gdc9c4"; + sha256 = "a770f26b5fce1a16460b68f135dfe97f4f4a9894b538ece0104a508c83ec65d5"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; debian60x86_64 = { - name = "debian-6.0.6-squeeze-amd64"; - fullName = "Debian 6.0.6 Squeeze (amd64)"; + name = "debian-6.0.7-squeeze-amd64"; + fullName = "Debian 6.0.7 Squeeze (amd64)"; packagesList = fetchurl { url = mirror://debian/dists/squeeze/main/binary-amd64/Packages.bz2; - sha256 = "1n1h3pz6axcaraxq8gfzq0jywlpdrqand1dnd4q79dy6cl788bi2"; + sha256 = "b2bb561bde59ac67e07c70aa7c86a33f237436e6891796a93c6ed6ffb032080e"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; diff --git a/pkgs/development/compilers/gcc/3.3/builder.sh b/pkgs/development/compilers/gcc/3.3/builder.sh index 5b80215cffb5..12e35f88b945 100644 --- a/pkgs/development/compilers/gcc/3.3/builder.sh +++ b/pkgs/development/compilers/gcc/3.3/builder.sh @@ -35,7 +35,7 @@ EOF cd ../build configureScript=../$sourceRoot/configure - configureFlags="--enable-languages=$langs" + configureFlags="--enable-languages=$langs --disable-multilib" } diff --git a/pkgs/development/compilers/gcc/3.3/default.nix b/pkgs/development/compilers/gcc/3.3/default.nix index 9aa9e27ac6f7..23501489925a 100644 --- a/pkgs/development/compilers/gcc/3.3/default.nix +++ b/pkgs/development/compilers/gcc/3.3/default.nix @@ -15,7 +15,12 @@ stdenv.mkDerivation { url = http://ftp.gnu.org/gnu/gcc/gcc-3.3.6/gcc-3.3.6.tar.bz2; md5 = "6936616a967da5a0b46f1e7424a06414"; }; - + + # inspiration: https://aur.archlinux.org/packages/g77/ + postPatch = '' + substituteInPlace gcc/config/i386/linux.h --replace 'struct siginfo' siginfo_t + ''; + inherit noSysDirs langC langCC langFortran; meta = { diff --git a/pkgs/development/compilers/gcc/3.4/default.nix b/pkgs/development/compilers/gcc/3.4/default.nix index 6cadf58d2ce6..1595b7f336fe 100644 --- a/pkgs/development/compilers/gcc/3.4/default.nix +++ b/pkgs/development/compilers/gcc/3.4/default.nix @@ -15,7 +15,12 @@ stdenv.mkDerivation { md5 = "4a21ac777d4b5617283ce488b808da7b"; }; - patches = if noSysDirs then [./no-sys-dirs.patch] else []; + patches = stdenv.lib.optional noSysDirs ./no-sys-dirs.patch; + + # inspiration: https://aur.archlinux.org/packages/g77/ + postPatch = '' + substituteInPlace gcc/config/i386/linux.h --replace 'struct siginfo' siginfo_t + ''; inherit noSysDirs profiledCompiler; diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix index 3494f63c11c8..99e91901d00c 100644 --- a/pkgs/development/compilers/ghc/with-packages.nix +++ b/pkgs/development/compilers/ghc/with-packages.nix @@ -60,17 +60,22 @@ stdenv.mkDerivation rec { echo -n . done for f in "$currentPath/etc/bash_completion.d/"*; do - mkdir -p $out/etc/bash_completion.d + mkdir -p $out/etc/bash_completion.d ln -s $f $out/etc/bash_completion.d/ echo -n . done - for s in 1 2 3 4 5 6 7 8 9; do - for f in "$currentPath/share/man/man$s/"*; do - mkdir -p $out/share/man/man$s + for s in 1 2 3 4 5 6 7 8 9; do + for f in "$currentPath/share/man/man$s/"*; do + mkdir -p $out/share/man/man$s ln -sv $f $out/share/man/man$s/ echo -n . - done - done + done + done + for f in "$currentPath/share/emacs/site-lisp/"*; do + mkdir -p $out/share/emacs/site-lisp + ln -s $f $out/share/emacs/site-lisp/ + echo -n . + done for f in "$currentPkgDir/"*.conf; do ln -s $f $linkedPkgDir echo -n . diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index b545fe8b55f2..73f13c11a7db 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -3,14 +3,14 @@ libX11, graphicsmagick, pcre, liblapack, texLive, pkgconfig, mesa, fltk, fftw, fftwSinglePrec, zlib, curl, qrupdate }: stdenv.mkDerivation rec { - name = "octave-3.6.3"; + name = "octave-3.6.4"; src = fetchurl { url = "mirror://gnu/octave/${name}.tar.bz2"; - sha256 = "11i82vyf514rvdqcgdanw0ppvag8lcm6198rars0dd0w1xahjzg3"; + sha256 = "0qn9s7jrjmrn6w3rvp8d7vfnymyv0spnxzrp9l7p8p8zb7wms67s"; }; buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11 - graphicsmagick pcre liblapack texLive pkgconfig mesa fltk zlib curl + graphicsmagick pcre liblapack pkgconfig mesa fltk zlib curl fftw fftwSinglePrec qrupdate ]; doCheck = true; diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 5a959eeb26fb..2f276fc163a6 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -10,23 +10,30 @@ g: # Get dependencies from patched gems activerecord = g.activerecord_3_2_12; activeresource = g.activeresource_3_2_12; activesupport = g.activesupport_3_2_12; + addressable = g.addressable_2_3_3; arel = g.arel_3_0_2; atoulme_Antwrap = g.atoulme_Antwrap_0_7_4; autotest_rails = g.autotest_rails_4_1_2; - aws_sdk = g.aws_sdk_1_8_3_1; + aws_sdk = g.aws_sdk_1_8_5; bitbucket_backup = g.bitbucket_backup_0_2_2; builder = g.builder_3_2_0; buildr = g.buildr_1_4_10; - bundler = g.bundler_1_3_1; + bundler = g.bundler_1_3_4; childprocess = g.childprocess_0_3_9; + chronic = g.chronic_0_9_1; daemons = g.daemons_1_1_9; diff_lcs = g.diff_lcs_1_1_3; dimensions = g.dimensions_1_2_0; + em_resolv_replace = g.em_resolv_replace_1_1_3; erubis = g.erubis_2_7_0; - eventmachine = g.eventmachine_1_0_1; + eventmachine = g.eventmachine_1_0_3; + eventmachine_tail = g.eventmachine_tail_0_6_4; fakes3 = g.fakes3_0_1_5; + faraday = g.faraday_0_8_6; + faraday_middleware = g.faraday_middleware_0_8_8; ffi = g.ffi_1_4_0; - foreman = g.foreman_0_61_0; + file_tail = g.file_tail_1_0_12; + foreman = g.foreman_0_62_0; highline = g.highline_1_6_15; hike = g.hike_1_2_1; hoe = g.hoe_3_1_0; @@ -42,15 +49,18 @@ g: # Get dependencies from patched gems mime_types = g.mime_types_1_21; minitar = g.minitar_0_5_3; multi_json = g.multi_json_1_6_1; + multipart_post = g.multipart_post_1_2_0; net_sftp = g.net_sftp_2_0_5; net_ssh = g.net_ssh_2_6_6; nix = g.nix_0_1_1; nokogiri = g.nokogiri_1_5_6; + papertrail = g.papertrail_0_9_7; + papertrail_cli = g.papertrail_cli_0_9_3; parallel = g.parallel_0_6_2; polyglot = g.polyglot_0_3_3; rack = g.rack_1_5_2; rack_cache = g.rack_cache_1_2; - rack_protection = g.rack_protection_1_4_0; + rack_protection = g.rack_protection_1_5_0; rack_ssl = g.rack_ssl_1_3_3; rack_test = g.rack_test_0_6_2; rails = g.rails_3_2_12; @@ -59,6 +69,7 @@ g: # Get dependencies from patched gems rb_fsevent = g.rb_fsevent_0_9_3; rdiscount = g.rdiscount_2_0_7_1; rdoc = g.rdoc_3_12_2; + remote_syslog = g.remote_syslog_1_6_13; rjb = g.rjb_1_4_6; rspec = g.rspec_2_11_0; rspec_core = g.rspec_core_2_11_1; @@ -66,23 +77,27 @@ g: # Get dependencies from patched gems rspec_mocks = g.rspec_mocks_2_11_3; rubyforge = g.rubyforge_2_0_4; rubyzip = g.rubyzip_0_9_9; - sass = g.sass_3_2_6; + sass = g.sass_3_2_7; selenium_webdriver = g.selenium_webdriver_2_31_0; + servolux = g.servolux_0_10_0; sinatra = g.sinatra_1_3_2; sprockets = g.sprockets_2_2_2; + syslog_protocol = g.syslog_protocol_0_9_2; systemu = g.systemu_2_5_2; therubyracer = g.therubyracer_0_10_2; thin = g.thin_1_5_0; thor = g.thor_0_17_0; - tilt = g.tilt_1_3_4; + tilt = g.tilt_1_3_5; + tins = g.tins_0_7_2; treetop = g.treetop_1_4_12; - tzinfo = g.tzinfo_0_3_36; + tzinfo = g.tzinfo_0_3_37; uuid = g.uuid_2_3_7; uuidtools = g.uuidtools_2_1_3; websocket = g.websocket_1_0_7; xml_simple = g.xml_simple_1_1_1; + yajl_ruby = g.yajl_ruby_1_1_0; }; - gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''jsduck'' ''nix'' ''rails'' ''rake'' ''rb-fsevent'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''uuid'' ]; + gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''jsduck'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''uuid'' ]; gems = { ZenTest_4_9_0 = { basename = ''ZenTest''; @@ -156,7 +171,7 @@ installed versions.''; 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-3.2.12''; - requiredGems = [ g.activesupport_3_2_12 g.activemodel_3_2_12 g.arel_3_0_2 g.tzinfo_0_3_36 ]; + requiredGems = [ g.activesupport_3_2_12 g.activemodel_3_2_12 g.arel_3_0_2 g.tzinfo_0_3_37 ]; sha256 = ''0fl8iyv3gcy72y79iv4ccyck8ik02rrl3pdy7yxfhlnqgryp8syi''; }; activeresource_3_2_12 = { @@ -181,6 +196,20 @@ installed versions.''; requiredGems = [ g.i18n_0_6_4 g.multi_json_1_6_1 ]; sha256 = ''1giqkprxjf5gyfyhn5nz9q8a5gi3v8irxhkpqr00zc5fw1azllsg''; }; + addressable_2_3_3 = { + basename = ''addressable''; + meta = { + description = ''URI Implementation''; + homepage = ''http://addressable.rubyforge.org/''; + longDescription = ''Addressable is a replacement for the URI implementation that is part of +Ruby's standard library. It more closely conforms to the relevant RFCs and +adds support for IRIs and URI templates. +''; + }; + name = ''addressable-2.3.3''; + requiredGems = [ ]; + sha256 = ''0nn583ba8kq4hhpr4lr2zzpm4r0mga0zfalxxpa6a4v27q71v5hh''; + }; arel_3_0_2 = { basename = ''arel''; meta = { @@ -233,16 +262,16 @@ rails support and extra plugins for migrations and fixtures.''; requiredGems = [ g.ZenTest_4_9_0 ]; sha256 = ''1wkb5jayb39yx0i8ly7sibygf9f9c3w24jg2z1qgm135zlb070v4''; }; - aws_sdk_1_8_3_1 = { + aws_sdk_1_8_5 = { basename = ''aws_sdk''; meta = { description = ''AWS SDK for Ruby''; homepage = ''http://aws.amazon.com/sdkforruby''; longDescription = ''AWS SDK for Ruby''; }; - name = ''aws-sdk-1.8.3.1''; + name = ''aws-sdk-1.8.5''; requiredGems = [ g.uuidtools_2_1_3 g.nokogiri_1_5_6 g.json_1_7_7 ]; - sha256 = ''1yiv2skrrwqw8ihznnqqznh4yax75hbv497xqllp7b5qqmnrpvy4''; + sha256 = ''0rhkkkfsw0qzckn99mnvpbnl7b1kysma3x8bbqwah2x438kwygpb''; }; bitbucket_backup_0_2_2 = { basename = ''bitbucket_backup''; @@ -316,19 +345,19 @@ for those one-off tasks, with a language that's a joy to use. ''; }; name = ''buildr-1.4.10''; - 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_1 ]; + 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_4 ]; sha256 = ''1x192r8ab5zr9rlp1i9b3pi3y74f9pj2w491wkgshgwj22akh6vn''; }; - bundler_1_3_1 = { + bundler_1_3_4 = { basename = ''bundler''; meta = { description = ''The best way to manage your application's dependencies''; homepage = ''http://gembundler.com''; longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably''; }; - name = ''bundler-1.3.1''; + name = ''bundler-1.3.4''; requiredGems = [ ]; - sha256 = ''1nmvfsk9148nkl0bdcs167kiihp89zwkyvjs0khvi4df6s9km725''; + sha256 = ''1vgrc71nhnqlrg08zvs63afa1z9kzn2vvn95b14dvy14k2br3qhj''; }; childprocess_0_3_9 = { basename = ''childprocess''; @@ -341,6 +370,17 @@ for those one-off tasks, with a language that's a joy to use. requiredGems = [ g.ffi_1_4_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''; + }; daemons_1_1_9 = { basename = ''daemons''; meta = { @@ -388,6 +428,16 @@ is the MIT license.''; requiredGems = [ ]; sha256 = ''1pqb7yzjcpbgbyi196ifqbd1wy570cn12bkzcvpcha4xilhajja0''; }; + em_resolv_replace_1_1_3 = { + basename = ''em_resolv_replace''; + meta = { + description = ''EventMachine-aware DNS lookup for Ruby''; + homepage = ''http://github.com/mperham/em-resolv-replace''; + }; + name = ''em-resolv-replace-1.1.3''; + requiredGems = [ ]; + sha256 = ''1w5y4rzmp51ni56v05qwgay5wrs2i6i3q92pvlcrghmhxhgsbqg7''; + }; erubis_2_7_0 = { basename = ''erubis''; meta = { @@ -411,7 +461,7 @@ is the MIT license.''; requiredGems = [ ]; sha256 = ''1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3''; }; - eventmachine_1_0_1 = { + eventmachine_1_0_3 = { basename = ''eventmachine''; meta = { description = ''Ruby/EventMachine library''; @@ -427,9 +477,20 @@ are provided with the package, primarily to serve as examples. The real goal of EventMachine is to enable programs to easily interface with other programs using TCP/IP, especially if custom protocols are required.''; }; - name = ''eventmachine-1.0.1''; + name = ''eventmachine-1.0.3''; requiredGems = [ ]; - sha256 = ''1v7im8v9y5jb863794irgnlqzdg669w6v1g89sln0l511gjnjv52''; + sha256 = ''09sqlsb6x9ddlgfw5gsw7z0yjg5m2qfjiqkz2fx70zsizj3lqhil''; + }; + eventmachine_tail_0_6_4 = { + basename = ''eventmachine_tail''; + meta = { + description = ''eventmachine tail - a file tail implementation with glob support''; + homepage = ''http://code.google.com/p/semicomplete/wiki/EventMachineTail''; + longDescription = ''Add file 'tail' implemented with EventMachine. Also includes a 'glob watch' class for watching a directory pattern for new matches, like /var/log/*.log''; + }; + name = ''eventmachine-tail-0.6.4''; + requiredGems = [ g.eventmachine_1_0_3 ]; + sha256 = ''1pvlb34vdzd81kf9f3xyibb4f55xjqm7lqqy28dgyci5cyv50y61''; }; fakes3_0_1_5 = { basename = ''fakes3''; @@ -441,6 +502,27 @@ using TCP/IP, especially if custom protocols are required.''; requiredGems = [ g.thor_0_17_0 g.builder_3_2_0 ]; sha256 = ''1na5wrbarla6s414svqmr5spbpv6vmcgpswal444x4clcpmadhib''; }; + faraday_0_8_6 = { + basename = ''faraday''; + meta = { + description = ''HTTP/REST API client library.''; + homepage = ''https://github.com/lostisland/faraday''; + }; + name = ''faraday-0.8.6''; + requiredGems = [ g.multipart_post_1_2_0 ]; + sha256 = ''16jd0gnqfrh5v4v88nlasyjjm8cmf2w2p6gphxq64mvdxlcdy5jy''; + }; + faraday_middleware_0_8_8 = { + 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.8.8''; + requiredGems = [ g.faraday_0_8_6 ]; + sha256 = ''1n0g8pm7ynx6ffyqhscc1cqw97zhvd8isr31yfyj15335j1jsncz''; + }; ffi_1_4_0 = { basename = ''ffi''; meta = { @@ -452,16 +534,27 @@ using TCP/IP, especially if custom protocols are required.''; requiredGems = [ ]; sha256 = ''06a29qvg487yk9pyi7wzyj5700mf7s3mjdqc6dsrh0467mjj9768''; }; - foreman_0_61_0 = { + file_tail_1_0_12 = { + basename = ''file_tail''; + meta = { + description = ''File::Tail for Ruby''; + homepage = ''http://github.com/flori/file-tail''; + longDescription = ''Library to tail files in Ruby''; + }; + name = ''file-tail-1.0.12''; + requiredGems = [ g.tins_0_7_2 ]; + sha256 = ''0mzxxnwj7k5pwxs0rdbmb3b41zgvzw7x40sf3qlkch4zdfx91i1j''; + }; + foreman_0_62_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.61.0''; + name = ''foreman-0.62.0''; requiredGems = [ g.thor_0_17_0 ]; - sha256 = ''1h9dmzq1cwz87qyzx2ibpjghsxjnnqbh485l3sdxyfh5k3v79k7z''; + sha256 = ''08i34rgs3bydk52zwpps4p0y2fvcnibp9lvfdhr75ppin7wv7lmr''; }; highline_1_6_15 = { basename = ''highline''; @@ -688,6 +781,17 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp requiredGems = [ ]; sha256 = ''0p33swcl9i97wvv0cq9jkdl8q7xbc3j07apy35vsgldnhw99krcg''; }; + multipart_post_1_2_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''; + requiredGems = [ ]; + sha256 = ''12p7lnmc52di1r4h73h6xrpppplzyyhani9p7wm8l4kgf1hnmwnc''; + }; net_sftp_2_0_5 = { basename = ''net_sftp''; meta = { @@ -747,6 +851,28 @@ enough of it.''; requiredGems = [ ]; sha256 = ''1235h8k242f6yi5qgb8rfcx6gp7g99djwqgrz0vb6w12pbp9kar8''; }; + papertrail_0_9_7 = { + 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_3 g.yajl_ruby_1_1_0 g.chronic_0_9_1 g.faraday_0_8_6 g.faraday_middleware_0_8_8 ]; + sha256 = ''0v0m1v0qabbr9pmyl77znz39qy1m7p0xwvf3lf9hyq6n524f2dwr''; + }; + papertrail_cli_0_9_3 = { + basename = ''papertrail_cli''; + meta = { + description = ''Placeholder gem to point to new papertrail gem''; + homepage = ''http://github.com/papertrail/papertrail-cli-gem''; + longDescription = ''Placeholder gem to point to new papertrail gem.''; + }; + name = ''papertrail-cli-0.9.3''; + requiredGems = [ g.papertrail_0_9_7 ]; + sha256 = ''1914dcfqsmw5rl4xd1zwjrfbgwglyncxm8km06bgxaqn4wnaq5iv''; + }; parallel_0_6_2 = { basename = ''parallel''; meta = { @@ -818,16 +944,16 @@ Also see http://rack.github.com/. requiredGems = [ g.rack_1_5_2 ]; sha256 = ''073ffpsqmy4nqxz178qisb3a4v3305c49ypj0jw6s9mkz02yvgq2''; }; - rack_protection_1_4_0 = { + 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.4.0''; + name = ''rack-protection-1.5.0''; requiredGems = [ g.rack_1_5_2 ]; - sha256 = ''0dfydg04fzj9rz34npy6cpp0827lij440s7fls0db41lz4vb94k0''; + sha256 = ''10wm67f2mp9pryg0s8qapbyxd2lcrpb8ywsbicg29cv2xprhbl4j''; }; rack_ssl_1_3_3 = { basename = ''rack_ssl''; @@ -863,7 +989,7 @@ request helpers feature.''; 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-3.2.12''; - requiredGems = [ g.activesupport_3_2_12 g.actionpack_3_2_12 g.activerecord_3_2_12 g.activeresource_3_2_12 g.actionmailer_3_2_12 g.railties_3_2_12 g.bundler_1_3_1 ]; + requiredGems = [ g.activesupport_3_2_12 g.actionpack_3_2_12 g.activerecord_3_2_12 g.activeresource_3_2_12 g.actionmailer_3_2_12 g.railties_3_2_12 g.bundler_1_3_4 ]; sha256 = ''1jjnm74nzl5v3461c0mrbpa471yd6s8hnkmnxb64c2rm95c61wxz''; }; railties_3_2_12 = { @@ -946,6 +1072,17 @@ See RDoc for a description of RDoc's markup and basic use.''; requiredGems = [ g.json_1_7_7 ]; sha256 = ''1v9k4sp5yzj2bshngckdvivj6bszciskk1nd2r3wri2ygs7vgqm8''; }; + remote_syslog_1_6_13 = { + basename = ''remote_syslog''; + meta = { + description = ''Monitor plain text log file(s) for new entries and send to remote syslog collector''; + homepage = ''http://github.com/papertrail/remote_syslog''; + longDescription = ''Lightweight daemon to tail one or more log files and transmit UDP syslog messages to a remote syslog host (centralized log aggregation). Generates UDP packets itself instead of depending on a system syslog daemon, so it doesn't affect system-wide logging configuration.''; + }; + name = ''remote_syslog-1.6.13''; + 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 = ''0q35j02k2l3fw3fdzq0i3rd6chsqr982gj13f3m3lsxm7kms03nw''; + }; rjb_1_4_2 = { basename = ''rjb''; meta = { @@ -1042,7 +1179,7 @@ See RDoc for a description of RDoc's markup and basic use.''; requiredGems = [ ]; sha256 = ''1khf6d903agnwd8965f5f8b353rzmfvygxp53z1199rqzw8h46q2''; }; - sass_3_2_6 = { + sass_3_2_7 = { basename = ''sass''; meta = { description = ''A powerful but elegant CSS compiler that makes CSS fun again.''; @@ -1053,9 +1190,9 @@ See RDoc for a description of RDoc's markup and basic use.''; command line tool or a web-framework plugin. ''; }; - name = ''sass-3.2.6''; + name = ''sass-3.2.7''; requiredGems = [ ]; - sha256 = ''10xy6k663399r881cj30fapbdsrq8jwzvnp97y8n3mhxmrvzpq28''; + sha256 = ''0c494gh1i4llk4lbi35vidsgclf3cgxind1a7nm499ac9sdz084s''; }; selenium_webdriver_2_31_0 = { basename = ''selenium_webdriver''; @@ -1068,6 +1205,20 @@ See RDoc for a description of RDoc's markup and basic use.''; requiredGems = [ g.multi_json_1_6_1 g.rubyzip_0_9_9 g.childprocess_0_3_9 g.websocket_1_0_7 ]; sha256 = ''1nv3ff31g183kdb97jjz0y7ny3vdnccd09pgblpj87bzhrrdfv3r''; }; + servolux_0_10_0 = { + basename = ''servolux''; + meta = { + description = ''* {Homepage}[http://rubygems.''; + homepage = ''http://gemcutter.org/gems/servolux''; + longDescription = ''Serv-O-Lux is a collection of Ruby classes that are useful for daemon and +process management, and for writing your own Ruby services. The code is well +documented and tested. It works with Ruby and JRuby supporting both 1.8 and 1.9 +interpreters.''; + }; + name = ''servolux-0.10.0''; + requiredGems = [ ]; + sha256 = ''08jdrk35f61ab8b48ffm85p9lgfpbnzq3n4is00gqhpcrrq72dhs''; + }; sinatra_1_3_2 = { basename = ''sinatra''; meta = { @@ -1076,7 +1227,7 @@ See RDoc for a description of RDoc's markup and basic use.''; 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_4_0 g.tilt_1_3_4 ]; + requiredGems = [ g.rack_1_5_2 g.rack_protection_1_5_0 g.tilt_1_3_5 ]; sha256 = ''05blf915zpiwyz7agcn9rwdmddwxz0z4l3gd4qlqmrgd2vkw4sxc''; }; sprockets_2_2_2 = { @@ -1087,9 +1238,20 @@ See RDoc for a description of RDoc's markup and basic use.''; longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.''; }; name = ''sprockets-2.2.2''; - requiredGems = [ g.hike_1_2_1 g.multi_json_1_6_1 g.rack_1_5_2 g.tilt_1_3_4 ]; + requiredGems = [ g.hike_1_2_1 g.multi_json_1_6_1 g.rack_1_5_2 g.tilt_1_3_5 ]; sha256 = ''15ngw3bjbyr31ygzmmdxxa30ylah6pdn8akgdy9w30vfx2vr7s7s''; }; + syslog_protocol_0_9_2 = { + basename = ''syslog_protocol''; + meta = { + description = ''Syslog protocol parser and generator''; + homepage = ''https://github.com/eric/syslog_protocol''; + longDescription = ''Syslog protocol parser and generator''; + }; + name = ''syslog_protocol-0.9.2''; + requiredGems = [ ]; + sha256 = ''1yb2cmbyj0zmb2yhkgnmghcngrkhcxs4g1svcmgfj90l2hs23nmc''; + }; systemu_2_5_2 = { basename = ''systemu''; meta = { @@ -1120,7 +1282,7 @@ See RDoc for a description of RDoc's markup and basic use.''; longDescription = ''A thin and fast web server''; }; name = ''thin-1.5.0''; - requiredGems = [ g.rack_1_5_2 g.eventmachine_1_0_1 g.daemons_1_1_9 ]; + requiredGems = [ g.rack_1_5_2 g.eventmachine_1_0_3 g.daemons_1_1_9 ]; sha256 = ''14sd2qbbk6y108z6v723mh3f1mk8s4fwxmmn9f8dk4xkhk4rwvq1''; }; thor_0_17_0 = { @@ -1134,16 +1296,27 @@ See RDoc for a description of RDoc's markup and basic use.''; requiredGems = [ ]; sha256 = ''0gf46qafcfgmi20a2mnb3wkd9y6spgy2hq22h70377daj4zjxla2''; }; - tilt_1_3_4 = { + tilt_1_3_5 = { basename = ''tilt''; meta = { description = ''Generic interface to multiple Ruby template engines''; homepage = ''http://github.com/rtomayko/tilt/''; longDescription = ''Generic interface to multiple Ruby template engines''; }; - name = ''tilt-1.3.4''; + name = ''tilt-1.3.5''; requiredGems = [ ]; - sha256 = ''0hw59shnf3vgpx1jv24mj0d48m72h5cm1d4bianhhkjj82mc406a''; + sha256 = ''081saxdxnal4ky38a904jw3n2837m80g211w0zm5rx6m712mb6qd''; + }; + tins_0_7_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.7.2''; + requiredGems = [ ]; + sha256 = ''142mvgn8218wikwdvd5gq4g6k3p24f273wlqvczzfhz02livrz90''; }; treetop_1_4_12 = { basename = ''treetop''; @@ -1155,16 +1328,16 @@ See RDoc for a description of RDoc's markup and basic use.''; requiredGems = [ g.polyglot_0_3_3 g.polyglot_0_3_3 ]; sha256 = ''1jlfjq67n933sm0px0s2j965v1kl1rj8fbx6xk8y4yppkv6ygxc8''; }; - tzinfo_0_3_36 = { + tzinfo_0_3_37 = { 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.36''; + name = ''tzinfo-0.3.37''; requiredGems = [ ]; - sha256 = ''1dk7jnhrr5lbhckgq7bh6yxgy8j7vd13qb4kr4vlk76j5ngs2whv''; + sha256 = ''0pi2vabsg73h6z4wfwyd27k63issp2qp1nh0vd74rdk740gmb3kc''; }; uuid_2_3_7 = { basename = ''uuid''; @@ -1212,5 +1385,15 @@ See RDoc for a description of RDoc's markup and basic use.''; 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''; + }; + name = ''yajl-ruby-1.1.0''; + requiredGems = [ ]; + sha256 = ''0sj46j47icb12hdhcfh76rnvddyiic5ifqzkh3kla1vcr505kf4m''; + }; }; } diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix index adfea12da952..10b0b2023877 100644 --- a/pkgs/development/interpreters/ruby/patches.nix +++ b/pkgs/development/interpreters/ruby/patches.nix @@ -1,5 +1,5 @@ { fetchurl, writeScript, ruby, ncurses, sqlite, libxml2, libxslt, libffi -, zlib, libuuid, gems, jdk }: +, zlib, libuuid, gems, jdk, python }: let @@ -14,6 +14,8 @@ in { sup = { buildInputs = [ gems.ncursesw ]; }; + + libv8 = { buildInputs = [ python ]; }; sqlite3 = { propagatedBuildInputs = [ sqlite ]; }; diff --git a/pkgs/development/libraries/opencascade/oce.nix b/pkgs/development/libraries/opencascade/oce.nix new file mode 100644 index 000000000000..500e62290501 --- /dev/null +++ b/pkgs/development/libraries/opencascade/oce.nix @@ -0,0 +1,26 @@ +{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, cmake, libtool, qt4, +ftgl, freetype}: + +stdenv.mkDerivation rec { + name = "opencascade-oce-0.13-dev"; + src = fetchurl { + url = https://api.github.com/repos/tpaviot/oce/tarball/bd77743bfa0e765c3a57d116a62d75b50e1a455; + name = "${name}.tar.gz"; + sha256 = "1w7z326la9427yb23hbalsksk6w4ma5xil4jscnvi8mk6g48wyxv"; + }; + + buildInputs = [ mesa tcl tk file libXmu libtool qt4 ftgl freetype cmake ]; + + preConfigure = '' + cmakeFlags="$cmakeFlags -DOCE_INSTALL_PREFIX=$out" + ''; + + enableParallelBuilding = true; + + meta = { + description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; + homepage = http://www.opencascade.org/; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix index 07f3797f0cd8..3f8af65f3bd8 100644 --- a/pkgs/development/mobile/androidenv/build-app.nix +++ b/pkgs/development/mobile/androidenv/build-app.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation { mv bin/*-${if release then "release" else "debug"}.apk $out mkdir -p $out/nix-support - echo "file binary-dist $(ls $out/*.apk)" > $out/nix-support/hydra-build-products + echo "file binary-dist $(echo $out/*.apk)" > $out/nix-support/hydra-build-products ''; } diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index 8f2594e84335..535ec0992c13 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -80,6 +80,10 @@ stdenv.mkDerivation { ${stdenv.lib.optionalString generateIPA '' # Produce an IPA file xcrun -sdk iphoneos PackageApplication -v $out/*.app -o $out/${name}.ipa + + # Add IPA to Hydra build products + mkdir -p $out/nix-support + echo "file binary-dist $(echo $out/*.ipa)" > $out/nix-support/hydra-build-products ''} # Delete our temp keychain diff --git a/pkgs/os-specific/linux/kernel/linux-3.8.nix b/pkgs/os-specific/linux/kernel/linux-3.8.nix index 9aaa2e80aab6..87421b1900d2 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.8.nix @@ -251,7 +251,7 @@ in import ./generic.nix ( rec { - version = "3.8.2"; + version = "3.8.3"; testing = false; preConfigure = '' @@ -260,7 +260,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1i7r89ba79x6irr95gq1b0cnkbmdz3llh72vdamn83s3zh6cy1fv"; + sha256 = "15jdsnsswpah8936xmq6r1jpfsp1kbq643i4l0bgc6n749f512ig"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix index cd21d6943965..4b3f5d444e3a 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.9.nix @@ -251,7 +251,7 @@ in import ./generic.nix ( rec { - version = "3.9-rc1"; + version = "3.9-rc2"; modDirVersion = "3.9.0-rc1"; testing = true; @@ -261,7 +261,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1bm4fdk1v3dlhcqrzwzrf6fscvq7p7493f5ld5lbspaw8vb08690"; + sha256 = "1aan14n6sw43qk9kpmdrpcakb1398kj2djqca8cvijc8g76973in"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index d63711e12ac8..6cacfc14ffc8 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${pythonDBus})" in/scripts=wicd.in sed -i "4iexport LC_ALL=\\\"${locale}\\\"" in/scripts=wicd.in sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-client.in - sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-client.in + sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-client.in sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-gtk.in - sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-gtk.in + sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-gtk.in sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-cli.in sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${pythonDBus})" in/scripts=wicd-cli.in ''; diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/tools/package-management/checkinstall/default.nix index aa935076eb98..a2b9c11eb09d 100644 --- a/pkgs/tools/package-management/checkinstall/default.nix +++ b/pkgs/tools/package-management/checkinstall/default.nix @@ -29,6 +29,10 @@ stdenv.mkDerivation { # Fix a `conflicting types for 'scandir'' error on Glibc 2.11. ./scandir.patch + + # Force use of old memcpy so that installwatch works on Glibc < + # 2.14. + ./use-old-memcpy.patch ]; buildInputs = [gettext]; diff --git a/pkgs/tools/package-management/checkinstall/glibc-check.patch b/pkgs/tools/package-management/checkinstall/glibc-check.patch index 9376da41d9e8..7f8cbccae8e5 100644 --- a/pkgs/tools/package-management/checkinstall/glibc-check.patch +++ b/pkgs/tools/package-management/checkinstall/glibc-check.patch @@ -52,7 +52,7 @@ diff -x '*~' -rc checkinstall-1.6.2pre20081116-orig/installwatch/create-localdec 6) echo '#define GLIBC_MINOR 6' >> $OUTFILE SUBVERSION='glibc-2.6' ;; -! 7|8|9|10|11|12|13|14|15) +! 7|8|9|10|11|12|13|14|15|16|17|18) echo '#define GLIBC_MINOR 7' >> $OUTFILE SUBVERSION='glibc-2.7' ;; *) diff --git a/pkgs/tools/package-management/checkinstall/use-old-memcpy.patch b/pkgs/tools/package-management/checkinstall/use-old-memcpy.patch new file mode 100644 index 000000000000..c8be7f0b5e26 --- /dev/null +++ b/pkgs/tools/package-management/checkinstall/use-old-memcpy.patch @@ -0,0 +1,12 @@ +diff -ru -x '*~' checkinstall-1.6.2-orig/installwatch/installwatch.c checkinstall-1.6.2/installwatch/installwatch.c +--- checkinstall-1.6.2-orig/installwatch/installwatch.c 2008-11-16 17:20:53.000000000 +0100 ++++ checkinstall-1.6.2/installwatch/installwatch.c 2013-03-15 13:50:12.717646381 +0100 +@@ -28,6 +28,8 @@ + * <mail@fredemmott.co.uk> + */ + ++asm (".symver memcpy, memcpy@GLIBC_2.2.5"); ++ + #include <sys/param.h> + #include <sys/types.h> + #include <sys/stat.h> diff --git a/pkgs/tools/system/storebrowse/default.nix b/pkgs/tools/system/storebrowse/default.nix new file mode 100644 index 000000000000..905818a59df2 --- /dev/null +++ b/pkgs/tools/system/storebrowse/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, fetchhg, go, sqlite}: + +assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64); + +stdenv.mkDerivation rec { + name = "storebrowse-20130316140138"; + + src = fetchurl { + url = "http://viric.name/cgi-bin/storebrowse/tarball/storebrowse-881990147c.tar.gz?uuid=881990147c"; + name = "${name}.tar.gz"; + sha256 = "183b6gz7xv88c94i9mgmjslsdn75v5vsbchl19kjv7mbrxfx5mvl"; + }; + + srcGoSqlite = fetchhg { + url = "https://code.google.com/p/gosqlite/"; + tag = "5baefb109e18"; + sha256 = "0mqfnx06jj15cs8pq9msny2z18x99hgk6mchnaxpg343nzdiz4zk"; + }; + + buildPhase = '' + PATH=${go}/bin:$PATH + mkdir $TMPDIR/go + export GOPATH=$TMPDIR/go + + GOSQLITE=$GOPATH/src/code.google.com/p/gosqlite + mkdir -p $GOSQLITE + cp -R $srcGoSqlite/* $GOSQLITE/ + export CGO_CFLAGS=-I${sqlite}/include + export CGO_LDFLAGS=-L${sqlite}/lib + go build -ldflags "-r ${sqlite}/lib" -o storebrowse + ''; + + installPhase = '' + ensureDir $out/bin + cp storebrowse $out/bin + ''; + + meta = { + homepage = http://viric.name/cgi-bin/storebrowse; + license = "AGPLv3+"; + }; +} diff --git a/pkgs/tools/typesetting/tex/nix/default.nix b/pkgs/tools/typesetting/tex/nix/default.nix index 9ae567e635b7..223f72c67855 100644 --- a/pkgs/tools/typesetting/tex/nix/default.nix +++ b/pkgs/tools/typesetting/tex/nix/default.nix @@ -66,7 +66,7 @@ rec { else if dep.type == "tex" then [".tex" ""] else [""]; fn = pkgs.lib.findFirst (fn: builtins.pathExists fn) null - (map (ext: "${dirOf key}/${dep.name}${ext}") exts); + (map (ext: dirOf key + ("/" + dep.name + ext)) exts); in if fn != null then [{key = fn;}] ++ xs else xs; @@ -90,8 +90,8 @@ rec { { src = key; } "${pkgs.stdenv.bash}/bin/bash ${./find-lhs2tex-includes.sh}"); - in pkgs.lib.concatMap (x : if builtins.pathExists x then [{key = x;}] else []) - (map (x : "${dirOf key}/${x}") deps); + in pkgs.lib.concatMap (x: if builtins.pathExists x then [{key = x;}] else []) + (map (x: dirOf key + ("/" + x)) deps); }; dot2pdf = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 941ba2a2bad2..ba6f934f01e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1565,6 +1565,8 @@ let inherit (gnome) libgnomeui scrollkeeper; }; + storebrowse = callPackage ../tools/system/storebrowse { }; + fusesmb = callPackage ../tools/filesystems/fusesmb { }; socat = callPackage ../tools/networking/socat { }; @@ -4660,6 +4662,8 @@ let ftgl = ftgl212; }; + opencascade_oce = callPackage ../development/libraries/opencascade/oce.nix { }; + opencsg = callPackage ../development/libraries/opencsg { }; openct = callPackage ../development/libraries/openct { }; @@ -7856,6 +7860,9 @@ let wrapPython = pythonPackages.wrapPython; }; + # This builds the gtk client + transmission_260 = callPackage ../applications/networking/p2p/transmission/2.60.nix { }; + transmission = callPackage ../applications/networking/p2p/transmission { }; transmission_remote_gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk {}; @@ -9054,6 +9061,8 @@ let vice = callPackage ../misc/emulators/vice { }; + viewnior = callPackage ../applications/graphics/viewnior { }; + vimprobable2 = callPackage ../applications/networking/browsers/vimprobable2 { inherit (gnome) libsoup; webkit = webkit_gtk2; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 877d2d3ed7c2..86ea190ee28c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -124,13 +124,13 @@ pythonPackages = python.modules // rec { alot = buildPythonPackage rec { - rev = "c765ebd6041a845a800cc9fd30705102ae2d040f"; - name = "alot-0.3.3_${rev}"; + rev = "d3c1880a60ddd8ded397d92cddf310a948b97fdc"; + name = "alot-0.3.4_${rev}"; src = fetchurl { url = "https://github.com/pazz/alot/tarball/${rev}"; name = "${name}.tar.bz"; - sha256 = "0yyp3nz5n1zfwf0l4rkkphq5l6prd988b57ighnmi2samzqa9yv4"; + sha256 = "049fzxs83zry5xr3al5wjvh7bcjq63wilf9wxh2c6sjmg96kpvvl"; }; # error: invalid command 'test' @@ -1049,17 +1049,18 @@ pythonPackages = python.modules // rec { flake8 = buildPythonPackage (rec { - name = "flake8-1.7.0"; + name = "flake8-2.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/f/flake8/${name}.tar.gz"; - md5 = "a7830d1a6c23e889bc1fcaa4a87f53bd"; + md5 = "176c6b3613777122721db181560aa1e3"; }; buildInputs = [ nose ]; + propagatedBuildInputs = [ pyflakes pep8 mccabe ]; # 3 failing tests - doCheck = false; + #doCheck = false; meta = { description = "code checking using pep8 and pyflakes."; @@ -1321,11 +1322,11 @@ pythonPackages = python.modules // rec { }); httplib2 = buildPythonPackage rec { - name = "httplib2-0.7.7"; + name = "httplib2-0.8"; src = fetchurl { url = "http://httplib2.googlecode.com/files/${name}.tar.gz"; - sha256 = "2e2ce18092c32d1ec54f8a447e14e33585e30f240b883bfeeca65f12b3bcfaf6"; + sha256 = "0gww8axb4j1vysbk9kfsk5vrws9a403gh30dxchmga8hrg1rns5g"; }; meta = { @@ -1651,6 +1652,25 @@ pythonPackages = python.modules // rec { }); + mccabe = buildPythonPackage (rec { + name = "mccabe-0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/m/mccabe/${name}.tar.gz"; + md5 = "c1012c7c24081471f45aab864d4e3805"; + }; + + buildInputs = [ ]; + + meta = { + description = "McCabe checker, plugin for flake8"; + homepage = "https://github.com/flintwork/mccabe"; + license = pkgs.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.garbas ]; + }; + }); + + mechanize = buildPythonPackage (rec { name = "mechanize-0.1.11"; @@ -2183,17 +2203,32 @@ pythonPackages = python.modules // rec { pep8 = buildPythonPackage rec { name = "pep8-${version}"; - version = "1.3.3"; + version = "1.4.5"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/pep8/${name}.tar.gz"; - md5 = "093a99ced0cc3b58c01549d7350f5a73"; - }; + md5 = "055dbd22ac5669232fdba752612e9686"; + }; + + #====================================================================== + #FAIL: test_check_simple (testsuite.test_shell.ShellTestCase) + #---------------------------------------------------------------------- + #Traceback (most recent call last): + # File "/tmp/nix-build-python-pep8-1.4.5.drv-0/pep8-1.4.5/testsuite/test_shell.py", line 84, in test_check_simple + # self.assertTrue(config_filename.endswith('tox.ini')) + #AssertionError: False is not true + # + #---------------------------------------------------------------------- + #Ran 21 tests in 0.711s + # + #FAILED (failures=1) + doCheck = false; meta = { - homepage = http://pypi.python.org/pypi/pep8/; + homepage = "http://pep8.readthedocs.org/"; description = "Python style guide checker"; license = pkgs.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.garbas ]; }; }; @@ -2530,6 +2565,24 @@ pythonPackages = python.modules // rec { }; }; + pyflakes = buildPythonPackage rec { + name = "pyflakes-0.6.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/pyflakes/${name}.tar.gz"; + md5 = "00debd2280b962e915dfee552a675915"; + }; + + buildInputs = [ unittest2 ]; + + meta = { + homepage = "https://launchpad.net/pyflakes"; + description = "A simple program which checks Python source files for errors."; + license = pkgs.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.garbas ]; + }; + }; + pyglet = buildPythonPackage rec { name = "pyglet-1.1.4"; @@ -3641,11 +3694,11 @@ pythonPackages = python.modules // rec { turses = buildPythonPackage (rec { - name = "turses-0.2.12"; + name = "turses-0.2.13"; src = fetchurl { url = "http://pypi.python.org/packages/source/t/turses/${name}.tar.gz"; - sha256 = "016fw2ch1gy3rrlfjsdpd6y11mkrbjw4h84h7954k2vhc84l1gm0"; + sha256 = "0sygm40z04zifcfqwby8wwwnj3i1bpl41r7xgnjcipxwirjmnp2k"; }; propagatedBuildInputs = [ oauth2 urwid tweepy ] ++ optional isPy26 argparse; |