diff options
Diffstat (limited to 'pkgs/applications')
11 files changed, 82 insertions, 30 deletions
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index bb51d23790b..a1a9b5e1135 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -14,7 +14,8 @@ composableDerivation {} { configureFlags = ["--enable-gui=auto" "--with-features=${args.features}"]; buildNativeInputs = [ncurses pkgconfig] - ++ [ gtk libX11 libXext libSM libXpm libXt libXaw libXau libXmu ]; + ++ [ gtk libX11 libXext libSM libXpm libXt libXaw libXau libXmu glib + libICE ]; # most interpreters aren't tested yet.. (see python for example how to do it) flags = { @@ -30,17 +31,18 @@ composableDerivation {} { // edf { name = "python"; feat = "pythoninterp"; enable = { buildNativeInputs = [python]; }; } #Include Python interpreter. // edf { name = "tcl"; enable = { buildNativeInputs = [tcl]; }; } #Include Tcl interpreter. // edf { name = "ruby"; feat = "rubyinterp"; enable = { buildNativeInputs = [ruby]; };} #Include Ruby interpreter. + // edf { name = "lua" ; feat = "luainterp"; enable = { buildNativeInputs = [lua]; configureFlags = ["--with-lua-prefix=${args.lua}"];};} // edf { name = "cscope"; } #Include cscope interface. // edf { name = "workshop"; } #Include Sun Visual Workshop support. // edf { name = "netbeans"; } #Disable NetBeans integration support. - // edf { name = "sniff"; } #Include Sniff interface. + // edf { name = "sniff"; feat = "sniff" ; } #Include Sniff interface. // edf { name = "multibyte"; } #Include multibyte editing support. - // edf { name = "hangulinput"; } #Include Hangul input support. - # // edf { name = "xim"; enable = { buildNativeInputs = [xim]; }; } #Include XIM input support. + // edf { name = "hangulinput"; feat = "hangulinput" ;} #Include Hangul input support. + // edf { name = "xim"; } #Include XIM input support. // edf { name = "fontset"; } #Include X fontset output support. // edf { name = "acl"; } #Don't check for ACL support. // edf { name = "gpm"; } #Don't use gpm (Linux mouse daemon). - // edf { name = "nls"; } #Don't support NLS (gettext()). + // edf { name = "nls"; enable = {buildNativeInputs = [gettext];}; } #Don't support NLS (gettext()). ; cfg = { diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index 00c6a1ef415..14de436379b 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -3,13 +3,13 @@ assert stdenv.system == "i686-linux"; stdenv.mkDerivation { - name = "adobe-reader-9.2-1"; + name = "adobe-reader-9.3.3-1"; builder = ./builder.sh; src = fetchurl { - url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.2/enu/AdbeRdr9.2-1_i486linux_enu.tar.bz2; - sha256 = "0067w0kjj2c04342g8c9qvcs49kkiqlxn2zyx9qzlg7a32qfc9l2"; + url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.3.3/enu/AdbeRdr9.3.3-1_i486linux_enu.tar.bz2; + sha256 = "1qssbdjy3v07agyh55bhsmvzakq9bs3hd6dw032ikwbpvb2gs807"; }; # !!! Adobe Reader contains copies of OpenSSL, libcurl, and libicu. diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index dbb20dc4fd9..bbe51bd1dad 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { libPath = stdenv.lib.makeLibraryPath - [ stdenv.glibc stdenv.gcc.gcc ffmpeg cairo pango glib libXrender gtk nspr nss fontconfig freetype alsaLib libX11 GConf libXext atk libXt expat zlib libjpeg bzip2 libpng libXScrnSaver dbus dbus_glib cups libgcrypt] ; + [ stdenv.gcc.libc stdenv.gcc.gcc ffmpeg cairo pango glib libXrender gtk nspr nss fontconfig freetype alsaLib libX11 GConf libXext atk libXt expat zlib libjpeg bzip2 libpng libXScrnSaver dbus dbus_glib cups libgcrypt] ; installPhase = '' ensureDir $out/bin diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index ca583c52ed1..d94c00daed9 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -46,11 +46,11 @@ in with stdenv; mkDerivation rec { meaning that one (or multiple) client(s) can attach to and detach from a central core -- much like the popular combination of screen and a text-based IRC client such - as WeeChat, but graphical(based on Qt4/KDE4). + as WeeChat, but graphical (based on Qt4/KDE4). ''; license = "GPLv3"; maintainers = [ maintainers.phreedom ]; - platforms = platforms.all; + inherit (qt4.meta) platforms; }; } diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix new file mode 100644 index 00000000000..a9cf07a0b12 --- /dev/null +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl, ncurses, openssl, perl, python, aspell}: + +stdenv.mkDerivation { + name = "weechat-0.3.2"; + + src = fetchurl { + url = http://weechat.org/files/src/weechat-0.3.2.tar.gz; + sha256 = "0ds548fmiv2fg69amhyg1v1rgyw51rqlp64p3rmsbm1lkcwwmivc"; + }; + + buildInputs = [ncurses perl python openssl aspell]; + + meta = { + homepage = http://http://www.weechat.org/; + description = "A fast, light and extensible chat client"; + }; +} + diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index acf88848f05..8716d39a176 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -4,19 +4,15 @@ {stdenv, fetchurl, ocaml, camlp5, lablgtk, ncurses}: let - - pname = "coq"; - version = "8.2pl1"; - name = "${pname}-${version}"; - + version = "8.2pl2"; in stdenv.mkDerivation { - inherit name; + name = "coq-${version}"; src = fetchurl { - url = "http://coq.inria.fr/V${version}/files/${name}.tar.gz"; - sha256 = "7c15acfd369111e51d937cce632d22fc77a6718a5ac9f2dd2dcbdfab4256ae0c"; + url = "http://coq.inria.fr/V${version}/files/coq-${version}.tar.gz"; + sha256 = "0dh2vv3bvz8694dd12kjdkdaq19l1vslvygzif11igshc5bw4rhf"; }; buildInputs = [ ocaml camlp5 ncurses lablgtk ]; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 3cdf200d581..76a8015cb15 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { - name = "git-1.7.1"; + name = "git-1.7.2.1"; src = fetchurl { url = "mirror://kernel/software/scm/git/${name}.tar.bz2"; - sha256 = "bcf008ec9639480a3ebfdc4708743b6c0978a8bd3103a2dda587ea9473b9dde2"; + sha256 = "5446b4ece3b8d81b1fcbcd6c4b91f1961b6f4047a3f6173e3200bee368724921"; }; patches = [ ./docbook2texi.patch ]; diff --git a/pkgs/applications/version-management/monotone-viz/graphviz.patch b/pkgs/applications/version-management/monotone-viz/graphviz.patch new file mode 100644 index 00000000000..e1f9bfc5f7f --- /dev/null +++ b/pkgs/applications/version-management/monotone-viz/graphviz.patch @@ -0,0 +1,34 @@ +# patch "agraph.ml" +# from [8ae6c9bb70bbf9fd80e4e62d9f162ac581619b9e] +# to [05aa88921481ac9bfe238daeb4374fbc9993caaa] +# +============================================================ +--- a/agraph.ml 8ae6c9bb70bbf9fd80e4e62d9f162ac581619b9e ++++ b/agraph.ml 05aa88921481ac9bfe238daeb4374fbc9993caaa +@@ -50,8 +50,9 @@ let dot_format params agraph = + agraph.nodes in + + !+ "digraph \"monotone-viz\"\n{\n" ; +- if params.lr_layout then +- !+ " graph [rankdir=LR] ;\n" ; ++ if params.lr_layout ++ then !+ " graph [rankdir=LR] ;\n" ++ else !+ " graph [rankdir=BT] ;\n" ; + !+ " graph [ranksep=\"0.25\"] ;\n" ; + !+ " node [label=\"\"] ;\n" ; + +@@ -222,11 +223,11 @@ let spawn_dot graph status done_cb = + let dot_prg = graph.layout_params.dot_program in + let cmd = + if Viz_misc.debug "dot" +- then [ "/bin/sh" ; "-c" ; ++ then [ "/bin/sh" ; "-c" ; + Printf.sprintf + "set -o pipefail ; \ +- tee agraph.in.dot | %s -q -y -s%.0f | tee agraph.out.dot" dot_prg ppi ] +- else [ dot_prg ; "-q" ; "-y" ; Printf.sprintf "-s%.0f" ppi ] in ++ tee agraph.in.dot | %s -q -s%.0f | tee agraph.out.dot" dot_prg ppi ] ++ else [ dot_prg ; "-q" ; Printf.sprintf "-s%.0f" ppi ] in + let error fmt = + Printf.kprintf (fun s -> done_cb (`LAYOUT_ERROR s)) fmt in + try diff --git a/pkgs/applications/version-management/monotone-viz/mtn-head.nix b/pkgs/applications/version-management/monotone-viz/mtn-head.nix index eb5228e09fd..9d9eb3a55bc 100644 --- a/pkgs/applications/version-management/monotone-viz/mtn-head.nix +++ b/pkgs/applications/version-management/monotone-viz/mtn-head.nix @@ -3,9 +3,9 @@ rec { src = fetchmtn { name = "monotone-viz-mtn-checkout"; dbs = ["monotone.ca"]; - selector = "0e9194c89eb87e62ac7d54c7b88b10b94b07fa41"; - branch = "net.venge.monotone-viz.automate"; - sha256 = "d7980c9729b0a58f0dd27768b8eae46b45462fe72a88534b8aa159d889b4d624"; + selector = "b34ff2e695b53c2d73d533a3ffa7cb081b48eefb"; + branch = "net.venge.monotone-viz.new-stdio"; + sha256 = "06263564bc111d865b50b4a9587a86f8d97fff47625a3c1cb98d90b79faf7889"; } + "/"; buildInputs = [ocaml lablgtk libgnomecanvas gtk graphviz glib @@ -13,12 +13,14 @@ rec { configureFlags = ["--with-lablgtk-dir=${lablgtk}/lib/ocaml/lablgtk2"]; /* doConfigure should be specified separately */ - phaseNames = ["doAutoconf" "doConfigure" "doMakeInstall"]; + phaseNames = ["doAutoconf" "doPatch" "doConfigure" "doMakeInstall"]; doAutoconf = fullDepEntry('' aclocal -I . autoconf -I . '') ["minInit" "addInputs" "doUnpack"]; + + patches = [ ./graphviz.patch ]; name = "monotone-viz-mtn-head"; meta = { diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index d1b4838491d..d03e30c6603 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib, iasl, dev86, libxslt, libxml2, libX11, xproto, libXext , libXcursor, qt4, libIDL, SDL, hal, libcap, zlib, libpng, glib, kernel -, python, which, alsaLib, curl +, python, which, alsaLib, curl, gawk }: stdenv.mkDerivation { @@ -72,7 +72,7 @@ stdenv.mkDerivation { sed -i -e "s|@INSTALL_PATH@|$out/virtualbox|" \ -e "s|@QT4_PATH@|${qt4}/lib|" \ -e "s|which|${which}/bin/which|" \ - -e "s|awk|${stdenv.gawk}/bin/awk|" \ + -e "s|awk|${gawk}/bin/awk|" \ $out/bin/VBox.sh chmod 755 $out/bin/VBox.sh for file in VirtualBox VBoxManage VBoxSDL diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 3d8782e4505..8d7cd7da9a1 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -4,11 +4,11 @@ , docbook_xml_dtd_45, libxslt, coreutils}: stdenv.mkDerivation rec { - name = "awesome-3.4.5"; + name = "awesome-3.4.6"; src = fetchurl { - url = http://awesome.naquadah.org/download/awesome-3.4.5.tar.xz; - sha256 = "124g6k4n2yf9shw3ig9lj1jdwiysfbj13mnjd38k22hqbj3yhnbi"; + url = http://awesome.naquadah.org/download/awesome-3.4.6.tar.xz; + sha256 = "1bxym326pl32q5jsaqa7p785k8yviinzj0q1l42pdhiiq717zbwi"; }; buildInputs = [ xz cmake gperf imagemagick pkgconfig lua glib cairo pango |