diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix index b00fb6d2dc7..2ea53fd4e55 100644 --- a/pkgs/applications/display-managers/slim/default.nix +++ b/pkgs/applications/display-managers/slim/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, x11, libjpeg, libpng, libXmu, freetype, pam}: stdenv.mkDerivation rec { - name = "slim-1.3.1"; + name = "slim-1.3.2"; src = fetchurl { url = "http://download.berlios.de/slim/${name}.tar.gz"; - sha256 = "0xqgzvg6h1bd29140mcgg9r16vcmskz7zmym7i7jlz7x9c1a9mxc"; + sha256 = "1f42skdp5k1zrb364s3i0ps5wmx9szz9h192i2dkn9az00jh2mpi"; }; patches = [ @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { # Don't set PAM_RHOST to "localhost", it confuses ConsoleKit # (which assumes that a non-empty string means a remote session). ./pam2.patch - - ./slim-1.3.1-gcc4.4.patch ]; buildInputs = [x11 libjpeg libpng libXmu freetype pam]; diff --git a/pkgs/applications/display-managers/slim/slim-1.3.1-gcc4.4.patch b/pkgs/applications/display-managers/slim/slim-1.3.1-gcc4.4.patch deleted file mode 100644 index 71b028ec080..00000000000 --- a/pkgs/applications/display-managers/slim/slim-1.3.1-gcc4.4.patch +++ /dev/null @@ -1,17 +0,0 @@ -Patch to allow compilation with gcc-4.4 - -Notified by Daniel J. - from Debian bug tracker - -http://bugs.gentoo.org/252745 - ---- a/switchuser.h 2008-11-11 19:40:18.000000000 +0000 -+++ a/switchuser.h 2008-11-11 19:40:28.000000000 +0000 -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - #include - #include "const.h" - #include "cfg.h" - diff --git a/pkgs/applications/editors/emacs-23/default.nix b/pkgs/applications/editors/emacs-23/default.nix index 54c5a5e2c19..5de1b38bb41 100644 --- a/pkgs/applications/editors/emacs-23/default.nix +++ b/pkgs/applications/editors/emacs-23/default.nix @@ -17,10 +17,12 @@ stdenv.mkDerivation rec { sha256 = "0kfa546qi0idkwk29gclgi13qd8q54pcqgy9qwjknlclszprdp3a"; }; - buildInputs = [ - ncurses x11 texinfo libXaw Xaw3d libXpm dbus libpng libjpeg libungif - libtiff librsvg gtk (if gtk != null then pkgconfig else null) libXft gconf - ]; + buildInputs = + [ ncurses x11 texinfo libXaw Xaw3d libXpm libpng libjpeg libungif + libtiff librsvg libXft gconf + ] + ++ stdenv.lib.optionals (gtk != null) [ gtk pkgconfig ] + ++ stdenv.lib.optional stdenv.isLinux dbus; configureFlags = stdenv.lib.optionals (gtk != null) [ "--with-x-toolkit=gtk" "--with-xft"] diff --git a/pkgs/applications/graphics/xscreensaver/default.nix b/pkgs/applications/graphics/xscreensaver/default.nix index 82d5bcc0b3a..ec8a4eaae91 100644 --- a/pkgs/applications/graphics/xscreensaver/default.nix +++ b/pkgs/applications/graphics/xscreensaver/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, pkgconfig, bc, perl, pam , libXext, libXScrnSaver, libX11, libXrandr, libXmu, libXxf86vm, libXrender , libXxf86misc -, libjpeg, mesa, gtk , libxml2, libglade}: +, libjpeg, mesa, gtk, libxml2, libglade +}: stdenv.mkDerivation rec { version = "5.12"; @@ -14,17 +15,15 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade pam - libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender - libXxf86misc ]; + libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender + libXxf86misc + ]; configureFlags = - [ - "--with-gl" "--with-pam" "--with-pixbuf" "--with-proc-interrupts" - + [ "--with-gl" "--with-pam" "--with-pixbuf" "--with-proc-interrupts" "--with-dpms-ext" "--with-randr-ext" "--with-xinerama-ext" "--with-xf86vmode-ext" "--with-xf86gamma-ext" "--with-randr-ext" "--with-xshm-ext" "--with-xdbe-ext" "--without-readdisplay" - "--with-x-app-defaults=\${out}/share/xscreensaver/app-defaults" ]; diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index 55d6a9c16b0..e0df36efcb8 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, xorg, ncurses, freetype, pkgconfig }: stdenv.mkDerivation rec { - name = "xterm-231"; + name = "xterm-268"; src = fetchurl { url = "ftp://invisible-island.net/xterm/${name}.tgz"; - sha256 = "0qlz5nkdqkahdg9kbd1ni96n69srj1pd9yggwrw3z0kghaajb2sr"; + sha256 = "1hr886mgr74k146fjppnq1pmg6f95l00v88cfwac3rms5lx7ckap"; }; buildInputs = @@ -20,6 +20,9 @@ stdenv.mkDerivation rec { --enable-mini-luit --with-tty-group=tty ''; + # Work around broken "plink.sh". + NIX_LDFLAGS = "-lXmu -lXt -lICE -lX11"; + # Hack to get xterm built with the feature of releasing a possible setgid of 'utmp', # decided by the sysadmin to allow the xterm reporting to /var/run/utmp # If we used the configure option, that would have affected the xterm installation, diff --git a/pkgs/applications/networking/browsers/firefox/3.6.nix b/pkgs/applications/networking/browsers/firefox/3.6.nix index 0d94ce37093..996703a6686 100644 --- a/pkgs/applications/networking/browsers/firefox/3.6.nix +++ b/pkgs/applications/networking/browsers/firefox/3.6.nix @@ -97,6 +97,8 @@ rec { rm -f $out/bin/run-mozilla.sh ''; # */ + enableParallelBuilding = true; + meta = { description = "Mozilla Firefox XUL runner"; homepage = http://www.mozilla.com/en-US/firefox/; diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix index 7c27bef0e45..5bc5cbf8c9b 100644 --- a/pkgs/applications/office/openoffice/default.nix +++ b/pkgs/applications/office/openoffice/default.nix @@ -7,6 +7,7 @@ }: let version = "3.2.1"; in + stdenv.mkDerivation rec { name = "openoffice.org-${version}"; builder = ./builder.sh; @@ -19,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "0gj2hinhnzkazh44k1an05x5cj7n6721f2grqrkjh31cm38r9p6i"; }; - patches = [ ./oo.patch ./root-required.patch ]; + patches = [ ./oo.patch ./root-required.patch ./xlib.patch ]; postPatch = /* Compiling with GCC 4.5 fails: diff --git a/pkgs/applications/office/openoffice/go-oo.nix b/pkgs/applications/office/openoffice/go-oo.nix index 35e39ff1cc7..241c2ff2a13 100644 --- a/pkgs/applications/office/openoffice/go-oo.nix +++ b/pkgs/applications/office/openoffice/go-oo.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { done sed '/-x $WGET/d' -i download ./download + # Needed to find genccode PATH=$PATH:${icu}/sbin @@ -53,6 +54,9 @@ stdenv.mkDerivation rec { set -x pushd build/${tag} + + patch -p1 < ${./xlib.patch} + # Fix svtools: hardcoded jpeg path sed -i -e 's,^JPEG3RDLIB=.*,JPEG3RDLIB=${libjpeg}/lib/libjpeg.so,' solenv/inc/libs.mk # Fix sysui: wants to create a tar for root @@ -64,6 +68,7 @@ stdenv.mkDerivation rec { # Fix redland: wants to set rpath to /usr/local/lib sed -i -e 's,^CONFIGURE_FLAGS.*,& --prefix='$TMPDIR, redland/redland/makefile.mk \ redland/raptor/makefile.mk redland/rasqal/makefile.mk + popd set +x diff --git a/pkgs/applications/office/openoffice/xlib.patch b/pkgs/applications/office/openoffice/xlib.patch new file mode 100644 index 00000000000..d5f0ff9aa20 --- /dev/null +++ b/pkgs/applications/office/openoffice/xlib.patch @@ -0,0 +1,22 @@ +https://bugs.freedesktop.org/show_bug.cgi?id=31322 + +diff -rc OOO320_m19-orig//vcl/unx/inc/dtint.hxx OOO320_m19//vcl/unx/inc/dtint.hxx +*** OOO320_m19-orig//vcl/unx/inc/dtint.hxx 2010-05-26 20:34:28.000000000 +0200 +--- OOO320_m19//vcl/unx/inc/dtint.hxx 2011-02-15 17:04:32.134813676 +0100 +*************** +*** 36,42 **** + class SalDisplay; + class AllSettings; + +! #ifndef _XLIB_H_ + // forwards from X + struct Display; + struct XEvent; +--- 36,42 ---- + class SalDisplay; + class AllSettings; + +! #if !defined(_XLIB_H_) && !defined(_X11_XLIB_H_) + // forwards from X + struct Display; + struct XEvent; diff --git a/pkgs/applications/window-managers/compiz/core.nix b/pkgs/applications/window-managers/compiz/core.nix index ef5279613d0..d4a5b79b7fb 100644 --- a/pkgs/applications/window-managers/compiz/core.nix +++ b/pkgs/applications/window-managers/compiz/core.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation { # directories to be overriden through $COMPIZ_PLUGINDIR and # $COMPIZ_METADATADIR, respectively. ./plugindir-core.patch + + # Fix compilation with recent GTK versions. + ./gdk-deprecated.patch ]; buildInputs = diff --git a/pkgs/applications/window-managers/compiz/gdk-deprecated.patch b/pkgs/applications/window-managers/compiz/gdk-deprecated.patch new file mode 100644 index 00000000000..d80a5514ee9 --- /dev/null +++ b/pkgs/applications/window-managers/compiz/gdk-deprecated.patch @@ -0,0 +1,14 @@ +diff -ru -x '*~' compiz-0.8.6-orig//gtk/window-decorator/gtk-window-decorator.c compiz-0.8.6//gtk/window-decorator/gtk-window-decorator.c +--- compiz-0.8.6-orig//gtk/window-decorator/gtk-window-decorator.c 2010-03-28 14:15:35.000000000 +0200 ++++ compiz-0.8.6//gtk/window-decorator/gtk-window-decorator.c 2011-03-14 11:00:00.000000000 +0100 +@@ -31,10 +31,6 @@ + #include + #include + +-#ifndef GDK_DISABLE_DEPRECATED +-#define GDK_DISABLE_DEPRECATED +-#endif +- + #ifndef GTK_DISABLE_DEPRECATED + #define GTK_DISABLE_DEPRECATED + #endif diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index 02096cd6141..632bc50c869 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, gettext, libjpeg, libtiff, libungif, libpng, imlib, xlibs, automake, pkgconfig, - gtk }: +{ stdenv, fetchurl, gettext, libjpeg, libtiff, libungif, libpng, imlib +, xlibs, automake, pkgconfig, gtk }: stdenv.mkDerivation rec { name = "icewm-1.3.6"; @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "1pr7rc10rddwvy4ncng4mf5fpxd1nqjsw34xba9ngsg32rg57b91"; }; + NIX_LDFLAGS = "-lfontconfig"; + # The fuloong2f is not supported by 1.3.6 still preConfigure = '' cp ${automake}/share/automake*/config.{sub,guess} . diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix index df8c97466ff..77a998b9f74 100644 --- a/pkgs/applications/window-managers/ratpoison/default.nix +++ b/pkgs/applications/window-managers/ratpoison/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, inputproto, libXt, libXpm, libXft, fontconfig +{ stdenv, fetchurl, libX11, inputproto, libXt, libXpm, libXft, fontconfig, freetype , libXtst, xextproto, readline, libXi, pkgconfig, perl, autoconf, automake }: stdenv.mkDerivation rec { @@ -18,8 +18,10 @@ stdenv.mkDerivation rec { preConfigure = "autoreconf -vf"; # needed because of the patch above + NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2"; # urgh + buildInputs = - [ libX11 inputproto libXt libXpm libXft fontconfig libXtst + [ libX11 inputproto libXt libXpm libXft fontconfig freetype libXtst xextproto readline libXi pkgconfig perl autoconf automake ]; diff --git a/pkgs/desktops/kde-4.5/base-workspace/default.nix b/pkgs/desktops/kde-4.5/base-workspace/default.nix index c409f4d0219..0fbafd2e407 100644 --- a/pkgs/desktops/kde-4.5/base-workspace/default.nix +++ b/pkgs/desktops/kde-4.5/base-workspace/default.nix @@ -15,6 +15,13 @@ kde.package { strigi soprano qimageblitz akonadi libpthreadstubs libdbusmenu_qt libqalculate pciutils bluez networkmanager ]; + patches = + [ # Don't do compositing with the software GLX driver, since it's + # completely broken (corrupt output, server crashes, etc.). + # (NixOS/121) + ./no-software-compositing.patch + ]; + meta = { description = "KDE base platform-specific components"; longDescription = "KDE base components that are only required to work with X11 such KDM and KWin"; diff --git a/pkgs/desktops/kde-4.5/base-workspace/no-software-compositing.patch b/pkgs/desktops/kde-4.5/base-workspace/no-software-compositing.patch new file mode 100644 index 00000000000..7c9e102bc95 --- /dev/null +++ b/pkgs/desktops/kde-4.5/base-workspace/no-software-compositing.patch @@ -0,0 +1,17 @@ +diff -ru -x '*~' kdebase-workspace-4.5.5-orig//kwin/compositingprefs.cpp kdebase-workspace-4.5.5/kwin/compositingprefs.cpp +--- kdebase-workspace-4.5.5-orig//kwin/compositingprefs.cpp 2010-06-24 18:28:18.000000000 +0200 ++++ kdebase-workspace-4.5.5/kwin/compositingprefs.cpp 2011-03-11 16:33:07.296566718 +0100 +@@ -314,9 +314,10 @@ + //else if( mDriver == "radeon" ) + // { + // } +- //else if( mDriver == "software" ) +- // { +- // } ++ else if( mDriver == "software" ) ++ { ++ mRecommendCompositing = false; ++ } + } + + diff --git a/pkgs/desktops/kde-4.5/kde-package/default.nix b/pkgs/desktops/kde-4.5/kde-package/default.nix index fbeb46cbcc5..81a36fe9502 100644 --- a/pkgs/desktops/kde-4.5/kde-package/default.nix +++ b/pkgs/desktops/kde-4.5/kde-package/default.nix @@ -19,6 +19,8 @@ rec { ).sha256; }; + enableParallelBuilding = true; + meta = { maintainers = with stdenv.lib.maintainers; [ sander urkud ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/atk/1.28.x.nix b/pkgs/development/libraries/atk/1.32.x.nix similarity index 70% rename from pkgs/development/libraries/atk/1.28.x.nix rename to pkgs/development/libraries/atk/1.32.x.nix index 753f8c59c87..99a02b22808 100644 --- a/pkgs/development/libraries/atk/1.28.x.nix +++ b/pkgs/development/libraries/atk/1.32.x.nix @@ -1,16 +1,18 @@ { stdenv, fetchurl, pkgconfig, perl, glib }: stdenv.mkDerivation rec { - name = "atk-1.28.0"; + name = "atk-1.32.0"; src = fetchurl { - url = "mirror://gnome/sources/atk/1.28/${name}.tar.bz2"; - sha256 = "11zyamivv7fcj9ap3w3bn3gm89mkni9waf51fx75zmfjh3jrznp4"; + url = "mirror://gnome/sources/atk/1.32/${name}.tar.bz2"; + sha256 = "e9a3e598f75c4db1af914f8b052dd9f7e89e920a96cc187c18eb06b8339cb16e"; }; - buildInputs = [pkgconfig perl]; - propagatedBuildInputs = [glib]; + buildInputs = [ pkgconfig perl ]; + propagatedBuildInputs = [ glib ]; + postInstall = "rm -rf $out/share/gtk-doc"; + meta = { description = "ATK, the accessibility toolkit"; diff --git a/pkgs/development/libraries/cairo/1.10.nix b/pkgs/development/libraries/cairo/1.10.nix deleted file mode 100644 index f1eaf65e69c..00000000000 --- a/pkgs/development/libraries/cairo/1.10.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ postscriptSupport ? true -, pdfSupport ? true -, pngSupport ? true -, xcbSupport ? false -, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype -, zlib, libpng, pixman, libxcb ? null, xcbutil ? null -}: - -assert postscriptSupport -> zlib != null; -assert pngSupport -> libpng != null; -assert xcbSupport -> libxcb != null && xcbutil != null; - -stdenv.mkDerivation rec { - name = "cairo-1.10.0"; - - src = fetchurl { - url = "http://cairographics.org/releases/${name}.tar.gz"; - sha256 = "1cllxp8rx5zxkfpn36ysqg1kqz5d1cvbbf2fsy440n8m8v6f8b0g"; - }; - - buildInputs = - [ pkgconfig x11 fontconfig pixman ] ++ - stdenv.lib.optionals xcbSupport [ libxcb xcbutil ]; - - propagatedBuildInputs = - [ freetype ] ++ - stdenv.lib.optional postscriptSupport zlib ++ - stdenv.lib.optional pngSupport libpng; - - configureFlags = - stdenv.lib.optional xcbSupport "--enable-xcb" ++ - stdenv.lib.optional pdfSupport "--enable-pdf"; - - preConfigure = '' - # Work around broken `Requires.private' that prevents Freetype - # `-I' flags to be propagated. - sed -i "src/cairo.pc.in" \ - -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype}/include/freetype2 -I${freetype}/include|g' - ''; - - meta = { - description = "A 2D graphics library with support for multiple output devices"; - - longDescription = '' - Cairo is a 2D graphics library with support for multiple output - devices. Currently supported output targets include the X - Window System, Quartz, Win32, image buffers, PostScript, PDF, - and SVG file output. Experimental backends include OpenGL - (through glitz), XCB, BeOS, OS/2, and DirectFB. - - Cairo is designed to produce consistent output on all output - media while taking advantage of display hardware acceleration - when available (e.g., through the X Render Extension). - ''; - - homepage = http://cairographics.org/; - - licenses = [ "LGPLv2+" "MPLv1" ]; - }; -} diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 5ca74561491..1e478b1c68d 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -2,7 +2,7 @@ , pdfSupport ? true , pngSupport ? true , xcbSupport ? false -, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype +, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs , zlib, libpng, pixman, libxcb ? null, xcbutil ? null }: @@ -11,15 +11,15 @@ assert pngSupport -> libpng != null; assert xcbSupport -> libxcb != null && xcbutil != null; stdenv.mkDerivation rec { - name = "cairo-1.8.10"; + name = "cairo-1.10.2"; src = fetchurl { url = "http://cairographics.org/releases/${name}.tar.gz"; - sha1 = "fd5e8ca82ff0e8542ea4c51612cad387f2a49df3"; + sha1 = "ccce5ae03f99c505db97c286a0c9a90a926d3c6e"; }; buildInputs = - [ pkgconfig x11 fontconfig pixman ] ++ + [ pkgconfig x11 fontconfig pixman xlibs.libXrender ] ++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ]; propagatedBuildInputs = @@ -28,8 +28,9 @@ stdenv.mkDerivation rec { stdenv.lib.optional pngSupport libpng; configureFlags = - stdenv.lib.optional xcbSupport "--enable-xcb" ++ - stdenv.lib.optional pdfSupport "--enable-pdf"; + [ "--enable-tee" ] + ++ stdenv.lib.optional xcbSupport "--enable-xcb" + ++ stdenv.lib.optional pdfSupport "--enable-pdf"; preConfigure = '' # Work around broken `Requires.private' that prevents Freetype @@ -38,6 +39,9 @@ stdenv.mkDerivation rec { -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype}/include/freetype2 -I${freetype}/include|g' ''; + # The default `--disable-gtk-doc' is ignored. + postInstall = "rm -rf $out/share/gtk-doc"; + meta = { description = "A 2D graphics library with support for multiple output devices"; diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index d2b123fade3..666c709f7de 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -1,17 +1,19 @@ { fetchurl, stdenv, pkgconfig, clutter, gtk }: stdenv.mkDerivation rec { - name = "clutter-gtk-0.10.4"; + name = "clutter-gtk-0.10.8"; src = fetchurl { url = "http://source.clutter-project.org/sources/clutter-gtk/0.10/${name}.tar.bz2"; - sha256 = "04mrq5ddj24zhh7dvyp9bl8510wq7qpmy3rl3wiqwl9c43gahd01"; + sha256 = "0508x1jfnlq0zhgscysvfa7i7ljkzm23d2myikvdjwc8ar8zjrvq"; }; buildInputs = [ pkgconfig clutter gtk ]; preConfigure = "export V=1"; + postBuild = "rm -rf $out/share/gtk-doc"; + meta = { description = "Clutter-GTK"; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 205a9020511..58fd70165d9 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -2,11 +2,11 @@ , libXcomposite, cairo, glib, pango, gtk, json_glib }: stdenv.mkDerivation rec { - name = "clutter-1.4.0"; + name = "clutter-1.4.2"; src = fetchurl { url = "http://source.clutter-project.org/sources/clutter/1.4/${name}.tar.bz2"; - sha256 = "15icq2gf2fi098lq1wqr7sq2cnb00g1ids050a5z3f43l1ajrnxw"; + sha256 = "14l8wgk5jdwsnjf991qgzl115kjs1xywil2awlrwj1airsn6gzcj"; }; buildInputs = [ pkgconfig ]; @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { libXi libXfixes libXdamage libXcomposite ]; - meta = { description = "Clutter, a library for creating fast, dynamic graphical user interfaces"; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 8f8766fb6cf..fdbc27a5617 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true }: let - version = "1.2.24"; + version = "1.4.6"; src = fetchurl { url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; - sha256 = "0j2wb79kndq4b1qqr59n1g6s0lm7yp6r9ny3skimadkh9a7p8b7i"; + sha256 = "0rx5p1f0jg4ch4958qb3ld3w3cw57a0rmvmxjgn1ir9dvxj1wgkm"; }; patches = [ ./ignore-missing-includedirs.patch ]; diff --git a/pkgs/development/libraries/expat/cve-2009-3560.patch b/pkgs/development/libraries/expat/cve-2009-3560.patch new file mode 100644 index 00000000000..71da9e39351 --- /dev/null +++ b/pkgs/development/libraries/expat/cve-2009-3560.patch @@ -0,0 +1,18 @@ +From: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/expat/files/expat-2.0.1-CVE-2009-3560-revised.patch?revision=1.1 + +http://nvd.nist.gov/nvd.cfm?cvename=CVE-2009-3560 +http://bugs.gentoo.org/show_bug.cgi?id=303727 +http://cvs.fedoraproject.org/viewvc/rpms/expat/devel/ + +--- a/lib/xmlparse.c ++++ b/lib/xmlparse.c +@@ -3703,6 +3703,9 @@ doProlog(XML_Parser parser, + return XML_ERROR_UNCLOSED_TOKEN; + case XML_TOK_PARTIAL_CHAR: + return XML_ERROR_PARTIAL_CHAR; ++ case -XML_TOK_PROLOG_S: ++ tok = -tok; ++ break; + case XML_TOK_NONE: + #ifdef XML_DTD + /* for internal PE NOT referenced between declarations */ diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index cd546a58169..35a2945207b 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -1,7 +1,17 @@ -{stdenv, fetchurl}: stdenv.mkDerivation { +{ stdenv, fetchurl }: + +stdenv.mkDerivation { name = "expat-2.0.1"; + src = fetchurl { url = mirror://sourceforge/expat/expat-2.0.1.tar.gz; sha256 = "14sy5qx9hgjyfs743iq8ywldhp5w4n6cscqf2p4hgrw6vys60xl4"; }; + + patches = [ ./cve-2009-3560.patch ]; + + meta = { + homepage = http://expat.sourceforge.net/; + description = "A stream-oriented XML parser library written in C"; + }; } diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index cac14642a3f..7c630fd026e 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "freetype-2.4.1"; + name = "freetype-2.4.4"; src = fetchurl { url = "mirror://sourceforge/freetype/${name}.tar.bz2"; - sha256 = "0gmyk6w7rbiiw7zjbyvkvp8wfl7q9n5576ifqq67qwsjdzlm9ja5"; + sha256 = "1vqg93473j6jma1bxms7mczk32j8is0g9inkcmmmqdsdvk3q30jb"; }; configureFlags = "--disable-static"; diff --git a/pkgs/development/libraries/gdk-pixbuf/2.22.x.nix b/pkgs/development/libraries/gdk-pixbuf/2.22.x.nix new file mode 100644 index 00000000000..e8e82367cd7 --- /dev/null +++ b/pkgs/development/libraries/gdk-pixbuf/2.22.x.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, xlibs }: + +stdenv.mkDerivation rec { + name = "gdk-pixbuf-2.22.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gdk-pixbuf/2.22/${name}.tar.bz2"; + sha256 = "6ce87eda24af9362307b2593c154d0b660f4e26d0abf2e71d46d0ddd55fd953d"; + }; + + # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. + buildInputs = [ pkgconfig glib libtiff libjpeg libpng xlibs.xlibs ]; + + postInstall = "rm -rf $out/share/gtk-doc"; + + meta = { + description = "A library for image loading and manipulation"; + + homepage = http://library.gnome.org/devel/gdk-pixbuf/; + + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix deleted file mode 100644 index bdeea121b43..00000000000 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, gtk, libtiff, libjpeg, libpng}: - -stdenv.mkDerivation rec { - name = "gdk-pixbuf-0.22.0"; - - src = fetchurl { - url = "ftp://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/0.22/${name}.tar.bz2"; - md5 = "05fcb68ceaa338614ab650c775efc2f2"; - }; - - buildInputs = [libtiff libjpeg libpng]; - propagatedBuildInputs = [gtk]; -} diff --git a/pkgs/development/libraries/glib/2.22.x.nix b/pkgs/development/libraries/glib/2.22.x.nix deleted file mode 100644 index f9129f7ae4a..00000000000 --- a/pkgs/development/libraries/glib/2.22.x.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv}: - -stdenv.mkDerivation rec { - name = "glib-2.22.5"; - - src = fetchurl { - url = "mirror://gnome/sources/glib/2.22/${name}.tar.bz2"; - sha256 = "802be9c9ffeb631725ffd6ed35af0af309776729a7fab4fcb48f2b0b8fe7245b"; - }; - - buildInputs = [pkgconfig gettext perl] - ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; - - # The nbd package depends on a static version of this library; hence - # the default configure flag --disable-static is switched off. - dontDisableStatic = true; - configureFlags = "--enable-static --enable-shared"; - - meta = { - description = "GLib, a C library of programming buildings blocks"; - - longDescription = '' - GLib provides the core application building blocks for libraries - and applications written in C. It provides the core object - system used in GNOME, the main loop implementation, and a large - set of utility functions for strings and common data structures. - ''; - - homepage = http://www.gtk.org/; - - license = "LGPLv2+"; - - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/glib/2.24.x.nix b/pkgs/development/libraries/glib/2.24.x.nix index 941697875b0..db7dbdd5c18 100644 --- a/pkgs/development/libraries/glib/2.24.x.nix +++ b/pkgs/development/libraries/glib/2.24.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib }: stdenv.mkDerivation rec { - name = "glib-2.24.1"; + name = "glib-2.24.2"; src = fetchurl { url = "mirror://gnome/sources/glib/2.24/${name}.tar.bz2"; - sha256 = "014c3da960bf17117371075c16495f05f36501db990851ceea658f15d2ea6d04"; + sha256 = "030nl16xa2ps9bklm2l81w0yamsrj5a0x7rp4h9dshinpld55srs"; }; buildInputs = [ pkgconfig gettext ] diff --git a/pkgs/development/libraries/glib/2.28.x.nix b/pkgs/development/libraries/glib/2.28.x.nix index b250cf2b342..a1ebaabbe06 100644 --- a/pkgs/development/libraries/glib/2.28.x.nix +++ b/pkgs/development/libraries/glib/2.28.x.nix @@ -1,19 +1,25 @@ { stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib }: stdenv.mkDerivation rec { - name = "glib-2.28.1"; + name = "glib-2.28.3"; src = fetchurl { url = "mirror://gnome/sources/glib/2.28/${name}.tar.bz2"; - sha256 = "1b85b998909202c07c2def66613ae6736aac48d7a0a7c98f98967b936fe9de22"; + sha256 = "7e1ab62d0f0cdc3f0ce8214b77d104b3abbd51185a9f3fc9b6a504cce26f6fab"; }; + # configure script looks for d-bus but it is only needed for tests buildInputs = [ pkgconfig gettext ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; buildNativeInputs = [ perl ]; propagatedBuildInputs = [ zlib ]; + # glib buildsystem fails to find python, thus hardcodes python2.4 in #! + postInstall = '' + rm -rvf $out/share/gtk-doc + sed -e 's@python2\.4@python@' -i $out/bin/gtester-report''; + meta = { description = "GLib, a C library of programming buildings blocks"; diff --git a/pkgs/development/libraries/gmime/default.nix b/pkgs/development/libraries/gmime/default.nix index bd94a2633d4..f5ae18f53c5 100644 --- a/pkgs/development/libraries/gmime/default.nix +++ b/pkgs/development/libraries/gmime/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, zlib }: stdenv.mkDerivation rec { - name = "gmime-2.4.17"; + name = "gmime-2.4.22"; src = fetchurl { url = "mirror://gnome/sources/gmime/2.4/${name}.tar.gz"; - sha256 = "1l1pbk0yrr7zwl90aabdhw0f9i4m6ragsfyk5qwg0hzk21abz9wd"; + sha256 = "0s93amrj7fh3p8lv770p7mrml07m6dps6srwi1wn76d2rfb944xn"; }; buildInputs = [ pkgconfig glib zlib ]; diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index f5fed1e1604..96629b25197 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -1,22 +1,27 @@ -{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python, cairo }: +{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python }: let baseName = "gobject-introspection"; - v = "0.6.10"; + v = "0.10.2"; in stdenv.mkDerivation rec { name = "${baseName}-${v}"; - buildInputs = [ flex bison glib pkgconfig python cairo ]; + buildInputs = [ flex bison glib pkgconfig python ]; propagatedBuildInputs = [ libffi ]; - configureFlags = "--enable-gcov"; + + # Tests depend on cairo, which is undesirable (it pulls in lots of + # other dependencies). + configureFlags = "--disable-tests"; src = fetchurl { - url = "mirror://gnome/sources/${baseName}/0.6/${name}.tar.bz2"; - sha256 = "0jwd7bybgvg6dwhg64da8k9yjrs37y5p153gaaapz5j59ld53g9n"; + url = "mirror://gnome/sources/${baseName}/0.10/${name}.tar.bz2"; + sha256 = "18di6v39hibb6j39vs0a5icaafihfryh8250kz7x1q1313pvm62v"; }; + postInstall = "rm -rf $out/share/gtk-doc"; + meta = with stdenv.lib; { maintainers = [ maintainers.urkud ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gtk+/2.20.x.nix b/pkgs/development/libraries/gtk+/2.20.x.nix index 38537aae595..53ad76ced53 100644 --- a/pkgs/development/libraries/gtk+/2.20.x.nix +++ b/pkgs/development/libraries/gtk+/2.20.x.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig jasper ]; propagatedBuildInputs = - [ xlibs.xlibs glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr ] + [ xlibs.xlibs glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr xlibs.libXrender ] ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama ++ stdenv.lib.optionals cupsSupport [ cups ]; diff --git a/pkgs/development/libraries/gtk+/2.18.x.nix b/pkgs/development/libraries/gtk+/2.24.x.nix similarity index 66% rename from pkgs/development/libraries/gtk+/2.18.x.nix rename to pkgs/development/libraries/gtk+/2.24.x.nix index 40ba6e13b22..e0e04dbace1 100644 --- a/pkgs/development/libraries/gtk+/2.18.x.nix +++ b/pkgs/development/libraries/gtk+/2.24.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, atk, pango, libtiff, libjpeg -, libpng, cairo, perl, jasper, xlibs +, libpng, cairo, perl, jasper, xlibs, gdk_pixbuf , xineramaSupport ? true , cupsSupport ? true, cups ? null }: @@ -8,21 +8,35 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { - name = "gtk+-2.18.9"; + name = "gtk+-2.24.3"; src = fetchurl { - url = "mirror://gnome/sources/gtk+/2.18/${name}.tar.bz2"; - sha256 = "5dcd8c406acbb8779c0b081a089fa87dfd7ab4d7d4c6075db478997ce96aa9b4"; + url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.bz2"; + sha256 = "336ddf3dd342cc36bee80dd4f86ef036044a2deb10cda67c8eecf5315b279ef7"; }; + + patches = + [ # Fix broken icons such as the back/forward buttons in Firefox. + # http://bugs.gentoo.org/339319 + ./old-icons.patch + ]; + + enableParallelBuilding = true; buildNativeInputs = [ perl ]; buildInputs = [ pkgconfig jasper ]; propagatedBuildInputs = - [ xlibs.xlibs glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr ] + [ xlibs.xlibs glib atk pango gdk_pixbuf /* libtiff libjpeg libpng */ cairo + xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi + ] ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama ++ stdenv.lib.optionals cupsSupport [ cups ]; + configureFlags = "--with-xinput=yes"; + + postInstall = "rm -rf $out/share/gtk-doc"; + passthru = { inherit libtiff libjpeg libpng; }; meta = { diff --git a/pkgs/development/libraries/gtk+/old-icons.patch b/pkgs/development/libraries/gtk+/old-icons.patch new file mode 100644 index 00000000000..438ff244d07 --- /dev/null +++ b/pkgs/development/libraries/gtk+/old-icons.patch @@ -0,0 +1,270 @@ +diff -ru -x '*~' gtk+-2.24.0-orig//gtk/Makefile.in gtk+-2.24.0//gtk/Makefile.in +--- gtk+-2.24.0-orig//gtk/Makefile.in 2011-01-30 05:39:20.000000000 +0100 ++++ gtk+-2.24.0//gtk/Makefile.in 2011-02-14 00:06:56.000000000 +0100 +@@ -1601,7 +1601,173 @@ + stock-icons/24/folder-remote.png \ + stock-icons/24/user-home.png \ + stock-icons/24/user-desktop.png \ +- stock-icons/24/text-x-generic.png ++ stock-icons/24/text-x-generic.png \ ++ stock-icons/16/gtk-quit.png \ ++ stock-icons/16/gtk-info.png \ ++ stock-icons/16/gtk-file.png \ ++ stock-icons/16/gtk-open.png \ ++ stock-icons/16/gtk-print-preview.png \ ++ stock-icons/16/gtk-print.png \ ++ stock-icons/16/gtk-properties.png \ ++ stock-icons/16/gtk-revert-to-saved-ltr.png \ ++ stock-icons/16/gtk-revert-to-saved-rtl.png \ ++ stock-icons/16/gtk-save-as.png \ ++ stock-icons/16/gtk-new.png \ ++ stock-icons/16/gtk-harddisk.png \ ++ stock-icons/16/gtk-clear.png \ ++ stock-icons/16/gtk-copy.png \ ++ stock-icons/16/gtk-cut.png \ ++ stock-icons/16/gtk-delete.png \ ++ stock-icons/16/gtk-find-and-replace.png \ ++ stock-icons/16/gtk-find.png \ ++ stock-icons/16/gtk-paste.png \ ++ stock-icons/16/gtk-redo-ltr.png \ ++ stock-icons/16/gtk-redo-rtl.png \ ++ stock-icons/16/gtk-select-all.png \ ++ stock-icons/16/gtk-undo-ltr.png \ ++ stock-icons/16/gtk-undo-rtl.png \ ++ stock-icons/16/gtk-directory.png \ ++ stock-icons/16/gtk-unindent-ltr.png \ ++ stock-icons/16/gtk-unindent-rtl.png \ ++ stock-icons/16/gtk-indent-ltr.png \ ++ stock-icons/16/gtk-indent-rtl.png \ ++ stock-icons/16/gtk-justify-center.png \ ++ stock-icons/16/gtk-justify-fill.png \ ++ stock-icons/16/gtk-justify-left.png \ ++ stock-icons/16/gtk-justify-right.png \ ++ stock-icons/16/gtk-bold.png \ ++ stock-icons/16/gtk-italic.png \ ++ stock-icons/16/gtk-strikethrough.png \ ++ stock-icons/16/gtk-underline.png \ ++ stock-icons/16/gtk-goto-bottom.png \ ++ stock-icons/16/gtk-go-down.png \ ++ stock-icons/16/gtk-goto-first-ltr.png \ ++ stock-icons/16/gtk-home.png \ ++ stock-icons/16/gtk-jump-to-ltr.png \ ++ stock-icons/16/gtk-jump-to-rtl.png \ ++ stock-icons/16/gtk-goto-last-ltr.png \ ++ stock-icons/16/gtk-go-forward-ltr.png \ ++ stock-icons/16/gtk-go-back-ltr.png \ ++ stock-icons/16/gtk-goto-top.png \ ++ stock-icons/16/gtk-go-up.png \ ++ stock-icons/16/gtk-about.png \ ++ stock-icons/16/gtk-help.png \ ++ stock-icons/16/gtk-missing-image.png \ ++ stock-icons/16/gtk-add.png \ ++ stock-icons/16/gtk-remove.png \ ++ stock-icons/16/gtk-floppy.png \ ++ stock-icons/16/gtk-cdrom.png \ ++ stock-icons/16/gtk-media-pause.png \ ++ stock-icons/16/gtk-media-play-ltr.png \ ++ stock-icons/16/gtk-media-play-rtl.png \ ++ stock-icons/16/gtk-media-stop.png \ ++ stock-icons/16/gtk-media-record.png \ ++ stock-icons/16/gtk-media-rewind-ltr.png \ ++ stock-icons/16/gtk-media-forward-ltr.png \ ++ stock-icons/16/gtk-media-previous-ltr.png \ ++ stock-icons/16/gtk-media-next-ltr.png \ ++ stock-icons/16/gtk-network.png \ ++ stock-icons/16/gtk-print-error.png \ ++ stock-icons/16/gtk-print-report.png \ ++ stock-icons/16/gtk-print-paused.png \ ++ stock-icons/16/gtk-print-warning.png \ ++ stock-icons/16/gtk-stop.png \ ++ stock-icons/16/gtk-execute.png \ ++ stock-icons/16/gtk-spell-check.png \ ++ stock-icons/16/gtk-fullscreen.png \ ++ stock-icons/16/gtk-refresh.png \ ++ stock-icons/16/gtk-leave-fullscreen.png \ ++ stock-icons/16/gtk-sort-ascending.png \ ++ stock-icons/16/gtk-sort-descending.png \ ++ stock-icons/16/gtk-close.png \ ++ stock-icons/16/gtk-zoom-fit.png \ ++ stock-icons/16/gtk-zoom-in.png \ ++ stock-icons/16/gtk-zoom-100.png \ ++ stock-icons/16/gtk-zoom-out.png \ ++ stock-icons/24/gtk-quit.png \ ++ stock-icons/24/gtk-info.png \ ++ stock-icons/24/gtk-file.png \ ++ stock-icons/24/gtk-open.png \ ++ stock-icons/24/gtk-print-preview.png \ ++ stock-icons/24/gtk-print.png \ ++ stock-icons/24/gtk-properties.png \ ++ stock-icons/24/gtk-revert-to-saved-ltr.png \ ++ stock-icons/24/gtk-revert-to-saved-rtl.png \ ++ stock-icons/24/gtk-save-as.png \ ++ stock-icons/24/gtk-new.png \ ++ stock-icons/24/gtk-harddisk.png \ ++ stock-icons/24/gtk-clear.png \ ++ stock-icons/24/gtk-copy.png \ ++ stock-icons/24/gtk-cut.png \ ++ stock-icons/24/gtk-delete.png \ ++ stock-icons/24/gtk-find-and-replace.png \ ++ stock-icons/24/gtk-find.png \ ++ stock-icons/24/gtk-paste.png \ ++ stock-icons/24/gtk-redo-ltr.png \ ++ stock-icons/24/gtk-redo-rtl.png \ ++ stock-icons/24/gtk-select-all.png \ ++ stock-icons/24/gtk-undo-ltr.png \ ++ stock-icons/24/gtk-undo-rtl.png \ ++ stock-icons/24/gtk-directory.png \ ++ stock-icons/24/gtk-unindent-ltr.png \ ++ stock-icons/24/gtk-unindent-rtl.png \ ++ stock-icons/24/gtk-indent-ltr.png \ ++ stock-icons/24/gtk-indent-rtl.png \ ++ stock-icons/24/gtk-justify-center.png \ ++ stock-icons/24/gtk-justify-fill.png \ ++ stock-icons/24/gtk-justify-left.png \ ++ stock-icons/24/gtk-justify-right.png \ ++ stock-icons/24/gtk-bold.png \ ++ stock-icons/24/gtk-italic.png \ ++ stock-icons/24/gtk-strikethrough.png \ ++ stock-icons/24/gtk-underline.png \ ++ stock-icons/24/gtk-goto-bottom.png \ ++ stock-icons/24/gtk-go-down.png \ ++ stock-icons/24/gtk-goto-first-ltr.png \ ++ stock-icons/24/gtk-home.png \ ++ stock-icons/24/gtk-jump-to-ltr.png \ ++ stock-icons/24/gtk-jump-to-rtl.png \ ++ stock-icons/24/gtk-goto-last-ltr.png \ ++ stock-icons/24/gtk-go-forward-ltr.png \ ++ stock-icons/24/gtk-go-back-ltr.png \ ++ stock-icons/24/gtk-goto-top.png \ ++ stock-icons/24/gtk-go-up.png \ ++ stock-icons/24/gtk-about.png \ ++ stock-icons/24/gtk-help.png \ ++ stock-icons/24/gtk-missing-image.png \ ++ stock-icons/24/gtk-add.png \ ++ stock-icons/24/gtk-remove.png \ ++ stock-icons/24/gtk-floppy.png \ ++ stock-icons/24/gtk-cdrom.png \ ++ stock-icons/24/gtk-media-pause.png \ ++ stock-icons/24/gtk-media-play-ltr.png \ ++ stock-icons/24/gtk-media-play-rtl.png \ ++ stock-icons/24/gtk-media-stop.png \ ++ stock-icons/24/gtk-media-record.png \ ++ stock-icons/24/gtk-media-rewind-ltr.png \ ++ stock-icons/24/gtk-media-forward-ltr.png \ ++ stock-icons/24/gtk-media-previous-ltr.png \ ++ stock-icons/24/gtk-media-next-ltr.png \ ++ stock-icons/24/gtk-network.png \ ++ stock-icons/24/gtk-print-error.png \ ++ stock-icons/24/gtk-print-report.png \ ++ stock-icons/24/gtk-print-paused.png \ ++ stock-icons/24/gtk-print-warning.png \ ++ stock-icons/24/gtk-stop.png \ ++ stock-icons/24/gtk-execute.png \ ++ stock-icons/24/gtk-spell-check.png \ ++ stock-icons/24/gtk-fullscreen.png \ ++ stock-icons/24/gtk-refresh.png \ ++ stock-icons/24/gtk-leave-fullscreen.png \ ++ stock-icons/24/gtk-sort-ascending.png \ ++ stock-icons/24/gtk-sort-descending.png \ ++ stock-icons/24/gtk-close.png \ ++ stock-icons/24/gtk-zoom-fit.png \ ++ stock-icons/24/gtk-zoom-in.png \ ++ stock-icons/24/gtk-zoom-100.png \ ++ stock-icons/24/gtk-zoom-out.png \ ++ stock-icons/48/gtk-dialog-error.png ++ + + @CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \ + @CROSS_COMPILING_FALSE@ ./gtk-update-icon-cache +@@ -2873,7 +3039,91 @@ + && $(LN_S) folder.png user-desktop.png \ + && $(RM) text-x-generic.png \ + && $(LN_S) document-x-generic.png text-x-generic.png \ ++ && $(LN_S) application-exit.png gtk-quit.png \ ++ && $(LN_S) dialog-information.png gtk-info.png \ ++ && $(LN_S) document-new.png gtk-file.png \ ++ && $(LN_S) document-open.png gtk-open.png \ ++ && $(LN_S) document-print-preview.png gtk-print-preview.png \ ++ && $(LN_S) document-print.png gtk-print.png \ ++ && $(LN_S) document-properties.png gtk-properties.png \ ++ && $(LN_S) document-revert-ltr.png gtk-revert-to-saved-ltr.png \ ++ && $(LN_S) document-revert-rtl.png gtk-revert-to-saved-rtl.png \ ++ && $(LN_S) document-save-as.png gtk-save-as.png \ ++ && $(LN_S) document-x-generic.png gtk-new.png \ ++ && $(LN_S) drive-harddisk.png gtk-harddisk.png \ ++ && $(LN_S) edit-clear.png gtk-clear.png \ ++ && $(LN_S) edit-copy.png gtk-copy.png \ ++ && $(LN_S) edit-cut.png gtk-cut.png \ ++ && $(LN_S) edit-delete.png gtk-delete.png \ ++ && $(LN_S) edit-find-replace.png gtk-find-and-replace.png \ ++ && $(LN_S) edit-find.png gtk-find.png \ ++ && $(LN_S) edit-paste.png gtk-paste.png \ ++ && $(LN_S) edit-redo-ltr.png gtk-redo-ltr.png \ ++ && $(LN_S) edit-redo-rtl.png gtk-redo-rtl.png \ ++ && $(LN_S) edit-select-all.png gtk-select-all.png \ ++ && $(LN_S) edit-undo-ltr.png gtk-undo-ltr.png \ ++ && $(LN_S) edit-undo-rtl.png gtk-undo-rtl.png \ ++ && $(LN_S) folder.png gtk-directory.png \ ++ && $(LN_S) format-indent-less-ltr.png gtk-unindent-ltr.png \ ++ && $(LN_S) format-indent-less-rtl.png gtk-unindent-rtl.png \ ++ && $(LN_S) format-indent-more-ltr.png gtk-indent-ltr.png \ ++ && $(LN_S) format-indent-more-rtl.png gtk-indent-rtl.png \ ++ && $(LN_S) format-justify-center.png gtk-justify-center.png \ ++ && $(LN_S) format-justify-fill.png gtk-justify-fill.png \ ++ && $(LN_S) format-justify-left.png gtk-justify-left.png \ ++ && $(LN_S) format-justify-right.png gtk-justify-right.png \ ++ && $(LN_S) format-text-bold.png gtk-bold.png \ ++ && $(LN_S) format-text-italic.png gtk-italic.png \ ++ && $(LN_S) format-text-strikethrough.png gtk-strikethrough.png \ ++ && $(LN_S) format-text-underline.png gtk-underline.png \ ++ && $(LN_S) go-bottom.png gtk-goto-bottom.png \ ++ && $(LN_S) go-down.png gtk-go-down.png \ ++ && $(LN_S) go-first-ltr.png gtk-goto-first-ltr.png \ ++ && $(LN_S) go-home.png gtk-home.png \ ++ && $(LN_S) go-jump-ltr.png gtk-jump-to-ltr.png \ ++ && $(LN_S) go-jump-rtl.png gtk-jump-to-rtl.png \ ++ && $(LN_S) go-last-ltr.png gtk-goto-last-ltr.png \ ++ && $(LN_S) go-next-ltr.png gtk-go-forward-ltr.png \ ++ && $(LN_S) go-previous-ltr.png gtk-go-back-ltr.png \ ++ && $(LN_S) go-top.png gtk-goto-top.png \ ++ && $(LN_S) go-up.png gtk-go-up.png \ ++ && $(LN_S) help-about.png gtk-about.png \ ++ && $(LN_S) help-contents.png gtk-help.png \ ++ && $(LN_S) image-missing.png gtk-missing-image.png \ ++ && $(LN_S) list-add.png gtk-add.png \ ++ && $(LN_S) list-remove.png gtk-remove.png \ ++ && $(LN_S) media-floppy.png gtk-floppy.png \ ++ && $(LN_S) media-optical.png gtk-cdrom.png \ ++ && $(LN_S) media-playback-pause.png gtk-media-pause.png \ ++ && $(LN_S) media-playback-start-ltr.png gtk-media-play-ltr.png \ ++ && $(LN_S) media-playback-start-rtl.png gtk-media-play-rtl.png \ ++ && $(LN_S) media-playback-stop.png gtk-media-stop.png \ ++ && $(LN_S) media-record.png gtk-media-record.png \ ++ && $(LN_S) media-seek-backward-ltr.png gtk-media-rewind-ltr.png \ ++ && $(LN_S) media-seek-forward-ltr.png gtk-media-forward-ltr.png \ ++ && $(LN_S) media-skip-backward-ltr.png gtk-media-previous-ltr.png \ ++ && $(LN_S) media-skip-forward-ltr.png gtk-media-next-ltr.png \ ++ && $(LN_S) network-idle.png gtk-network.png \ ++ && $(LN_S) printer-error.png gtk-print-error.png \ ++ && $(LN_S) printer-info.png gtk-print-report.png \ ++ && $(LN_S) printer-paused.png gtk-print-paused.png \ ++ && $(LN_S) printer-warning.png gtk-print-warning.png \ ++ && $(LN_S) process-stop.png gtk-stop.png \ ++ && $(LN_S) system-run.png gtk-execute.png \ ++ && $(LN_S) tools-check-spelling.png gtk-spell-check.png \ ++ && $(LN_S) view-fullscreen.png gtk-fullscreen.png \ ++ && $(LN_S) view-refresh.png gtk-refresh.png \ ++ && $(LN_S) view-restore.png gtk-leave-fullscreen.png \ ++ && $(LN_S) view-sort-ascending.png gtk-sort-ascending.png \ ++ && $(LN_S) view-sort-descending.png gtk-sort-descending.png \ ++ && $(LN_S) window-close.png gtk-close.png \ ++ && $(LN_S) zoom-fit-best.png gtk-zoom-fit.png \ ++ && $(LN_S) zoom-in.png gtk-zoom-in.png \ ++ && $(LN_S) zoom-original.png gtk-zoom-100.png \ ++ && $(LN_S) zoom-out.png gtk-zoom-out.png \ + ) done \ ++ && (cd stock-icons/48 \ ++ && $(LN_S) dialog-error.png gtk-dialog-error.png) \ + && touch stamp-icons + + gtkbuiltincache.h: @REBUILD@ stamp-icons diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index aff6372d611..ad6f4536604 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, pkgconfig, libpthreadstubs}: stdenv.mkDerivation rec { - name = "libdrm-2.4.22"; + name = "libdrm-2.4.24"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "0gbb7i282i6gf2wzbzkcz5j662v4ixpfjf0gv0090k89wjafbc0b"; + sha256 = "19dnzy7g6jqfjz38dp187b97vb4a8h4k748x56gsyn24ys0j60f7"; }; buildInputs = [ pkgconfig libpthreadstubs ]; diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index 6fff6b6217d..f598482f830 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "libjpeg-8"; + name = "libjpeg-8c"; src = fetchurl { url = http://www.ijg.org/files/jpegsrc.v8c.tar.gz; diff --git a/pkgs/development/libraries/mesa/7.9.nix b/pkgs/development/libraries/mesa/7.9.nix deleted file mode 100644 index 89652066d17..00000000000 --- a/pkgs/development/libraries/mesa/7.9.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat, lipo ? null, - talloc, python, libxml2, libxml2Python}: - -if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then - throw "unsupported platform for Mesa" -else - -stdenv.mkDerivation rec { - version = "7.9"; - name = "mesa-${version}"; - - src = fetchurl { - url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2"; - sha256 = "1wr927mdghn7w1cmp0bxswjda5s2x0hwfpf8zcc9x03da7s6gkg0"; - }; - - configureFlags = - "--disable-gallium" - + (if stdenv.system == "mips64-linux" then - " --with-dri-drivers=swrast --with-driver=dri" else "") - + (if stdenv.isDarwin then " --disable-egl" else ""); - - buildInputs = - [ pkgconfig expat x11 libdrm xlibs.glproto - xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto - lipo talloc python libxml2 libxml2Python - ]; - - passthru = { inherit libdrm; }; - - meta = { - description = "An open source implementation of OpenGL"; - homepage = http://www.mesa3d.org/; - license = "bsd"; - }; -} diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 9b449be1335..c769bd64c53 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,29 +1,35 @@ -{ stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat, lipo ? null }: +{ stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat, lipo ? null, talloc }: if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then throw "unsupported platform for Mesa" else +let version = "7.10.1"; in + stdenv.mkDerivation { - name = "mesa-7.8.2"; + name = "mesa-${version}"; src = fetchurl { - url = ftp://ftp.freedesktop.org/pub/mesa/7.8.2/MesaLib-7.8.2.tar.bz2; - md5 = "6be2d343a0089bfd395ce02aaf8adb57"; + url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2"; + md5 = "efe8da4d80c2a5d32a800770b8ce5dfa"; }; + patches = [ ./swrast-settexbuffer.patch ]; + configureFlags = "--disable-gallium" - + (if stdenv.system == "mips64-linux" then - " --with-dri-drivers=swrast --with-driver=dri" else "") - + (if stdenv.isDarwin then " --disable-egl" else ""); + + stdenv.lib.optionalString (stdenv.system == "mips64-linux") + " --with-dri-drivers=swrast --with-driver=dri" + + stdenv.lib.optionalString stdenv.isDarwin " --disable-egl"; buildInputs = - [ pkgconfig expat x11 libdrm xlibs.glproto + [ pkgconfig expat x11 libdrm xlibs.makedepend xlibs.glproto xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto - lipo + lipo talloc ]; + enableParallelBuilding = true; + passthru = { inherit libdrm; }; meta = { diff --git a/pkgs/development/libraries/mesa/swrast-settexbuffer.patch b/pkgs/development/libraries/mesa/swrast-settexbuffer.patch new file mode 100644 index 00000000000..c74daa3aef1 --- /dev/null +++ b/pkgs/development/libraries/mesa/swrast-settexbuffer.patch @@ -0,0 +1,24 @@ +https://build.opensuse.org/package/view_file?file=0001-Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch&package=Mesa&project=openSUSE%3AFactory&srcmd5=be25d34ad69853c2bb21ed376061d573 + +diff -ru Mesa-7.10.1-orig//src/mesa/drivers/dri/swrast/swrast.c Mesa-7.10.1//src/mesa/drivers/dri/swrast/swrast.c +--- Mesa-7.10.1-orig//src/mesa/drivers/dri/swrast/swrast.c 2010-12-14 22:43:15.000000000 +0100 ++++ Mesa-7.10.1//src/mesa/drivers/dri/swrast/swrast.c 2011-03-07 18:08:17.062816112 +0100 +@@ -61,6 +61,7 @@ + static void swrastSetTexBuffer2(__DRIcontext *pDRICtx, GLint target, + GLint texture_format, __DRIdrawable *dPriv) + { ++ GET_CURRENT_CONTEXT(ctx); + struct dri_context *dri_ctx; + int x, y, w, h; + __DRIscreen *sPriv = dPriv->driScreenPriv; +@@ -90,6 +91,10 @@ + _mesa_init_teximage_fields(&dri_ctx->Base, target, texImage, + w, h, 1, 0, internalFormat, texFormat); + ++ ctx->Driver.TexImage2D(ctx, target, 0, internalFormat, ++ w, h, 0, texture_format, GL_UNSIGNED_INT_8_8_8_8, ++ NULL, &ctx->Unpack, texObj, texImage); ++ + sPriv->swrast_loader->getImage(dPriv, x, y, w, h, (char *)texImage->Data, + dPriv->loaderPrivate); + diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 54d4265e01c..4897d08574d 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -7,11 +7,11 @@ let in stdenv.mkDerivation rec { - name = "openssl-1.0.0c"; + name = "openssl-1.0.0d"; src = fetchurl { url = "http://www.openssl.org/source/${name}.tar.gz"; - sha256 = "1sq4sswyjxnr08lyjcafwdha6j5jd2b48vxfg48kdapdwdnv6cgp"; + sha256 = "1nr0cf6pf8i4qsnx31kqhiqv402xgn76yhjhlbdri8ma1hgislcj"; }; patches = stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch; @@ -25,6 +25,15 @@ stdenv.mkDerivation rec { configureFlags = "shared --libdir=lib"; + postInstall = + '' + # If we're building dynamic libraries, then don't install static + # libraries. + if [ -n "$(echo $out/lib/*.so)" ]; then + rm $out/lib/*.a + fi + ''; # */ + crossAttrs = { preConfigure='' # It's configure does not like --build or --host diff --git a/pkgs/development/libraries/pango/1.26.x.nix b/pkgs/development/libraries/pango/1.26.x.nix deleted file mode 100644 index fb24cb544b0..00000000000 --- a/pkgs/development/libraries/pango/1.26.x.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }: - -stdenv.mkDerivation rec { - name = "pango-1.26.2"; - - src = fetchurl { - url = "mirror://gnome/sources/pango/1.26/${name}.tar.bz2"; - sha256 = "021ygk3l9bk00gsvxk02flxsk68w0wl99dx221fmb547bng8g19v"; - }; - - buildInputs = [pkgconfig] ++ stdenv.lib.optional (stdenv.system == "i686-darwin") gettext; - - propagatedBuildInputs = [x11 glib cairo libpng]; - - meta = { - description = "A library for laying out and rendering of text, with an emphasis on internationalization"; - - longDescription = '' - Pango is a library for laying out and rendering of text, with an - emphasis on internationalization. Pango can be used anywhere - that text layout is needed, though most of the work on Pango so - far has been done in the context of the GTK+ widget toolkit. - Pango forms the core of text and font handling for GTK+-2.x. - ''; - - homepage = http://www.pango.org/; - license = "LGPLv2+"; - - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/pango/1.28.x.nix b/pkgs/development/libraries/pango/1.28.x.nix index 47418be6693..a5aa77b5a39 100644 --- a/pkgs/development/libraries/pango/1.28.x.nix +++ b/pkgs/development/libraries/pango/1.28.x.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ x11 glib cairo libpng ]; + postInstall = "rm -rf $out/share/gtk-doc"; + meta = { description = "A library for laying out and rendering of text, with an emphasis on internationalization"; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 0e4b6cab650..35a1a37e39f 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { - name = "polkit-0.96"; + name = "polkit-0.99"; src = fetchurl { url = "http://hal.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "0jh5v0dhf9msvmfmr9d67563m64gq5l96m9jax9abchhfa8wl9il"; + sha256 = "0gsqnc5x6angma7paw0hnl5cagqimsj5f022a5vzc8n8dv1cf4pn"; }; buildInputs = [ pkgconfig glib eggdbus expat pam intltool gettext diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 97f1b7cc26e..f8fe2330cf9 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv}: +{ fetchurl, stdenv }: stdenv.mkDerivation rec { name = "talloc-2.0.1"; @@ -9,12 +9,11 @@ stdenv.mkDerivation rec { }; configureFlags = "--enable-talloc-compat1 --enable-largefile"; + meta = { description = "talloc is a hierarchical pool based memory allocator with destructors"; - homepage = http://tdb.samba.org/; license = "GPLv3"; - platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 73fa3c37f39..52daa939c7b 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl , dbus, libusb, acl }: -let version = "1.4.5"; in +let version = "1.4.6"; in stdenv.mkDerivation { name = "cups-${version}"; src = fetchurl { url = "http://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2"; - sha256 = "1zhf3hvx11i0qnbwyybmdhx4fxkxfd4ch69k59fj5bz8wvcdcl04"; + sha256 = "056mdbz0g1jjihk03xjyp4f1bxl2aksf2vzra1qjrdbp59q131zh"; }; buildInputs = [ pkgconfig zlib libjpeg libpng libtiff pam dbus libusb acl ]; diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix index 53c55de9a37..a6f457b5210 100644 --- a/pkgs/misc/emulators/gens-gs/default.nix +++ b/pkgs/misc/emulators/gens-gs/default.nix @@ -10,6 +10,10 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig gtkLibs.gtk SDL nasm zlib libpng mesa ]; + # Work around build failures on recent GTK+. + # See http://ubuntuforums.org/showthread.php?p=10535837 + NIX_CFLAGS_COMPILE = "-UGTK_DISABLE_DEPRECATED -UGSEAL_ENABLE"; + meta = { homepage = http://segaretro.org/Gens/GS; description = "A Genesis/Mega Drive emulator"; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index a9604eab7ce..bb193608e19 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; -let versionNumber = "260.19.36"; in +let versionNumber = "260.19.44"; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; @@ -18,12 +18,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "0vfcfvn59qg53kqkij83pidssfnafd720hrx62cm7jmqzp5vgyvc"; + sha256 = "06sp7wi1q2sh00r0nm340zpfjhngf4qifflbnk2ai88gb6zrpi54"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "18wqfnmaiz0smf9xbzc3389nwz5lhisq8330bi0z9skwfjlpai2f"; + sha256 = "0hqp56sf61wc9fn3zdvc0lr8w170p36mmf9irgpz0g96qwnic2z9"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; @@ -38,7 +38,7 @@ stdenv.mkDerivation { cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc]; programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath - [ gtkLibs.gtk gtkLibs.atk gtkLibs.pango gtkLibs.glib xlibs.libXv ] ); + [ gtkLibs.gtk gtkLibs.atk gtkLibs.pango gtkLibs.glib gtkLibs.gdk_pixbuf xlibs.libXv ] ); buildInputs = [ perl ]; diff --git a/pkgs/os-specific/linux/udev/default.nix b/pkgs/os-specific/linux/udev/default.nix index 4dec9200ed5..11e044244b5 100644 --- a/pkgs/os-specific/linux/udev/default.nix +++ b/pkgs/os-specific/linux/udev/default.nix @@ -4,11 +4,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - name = "udev-160"; + name = "udev-166"; src = fetchurl { url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2"; - sha256 = "0wx43bxiff8i80k7w3j2iszksdzw1hz6sanx8cjsiypgppi4fr12"; + sha256 = "1msl8cwf47shmz5lr2w9w3nzzxqnf5dc0bs7dvbnxmbal60p7lpm"; }; buildInputs = [ gperf pkgconfig glib acl libusb usbutils ]; @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { sed -e '/PATH=/d' -i $out/libexec/rule_generator.functions ln -s $out/lib/ConsoleKit $out/etc/ConsoleKit + + rm -rf $out/share/gtk-doc ''; meta = { diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh index 528042e3df9..c33d1806fd6 100644 --- a/pkgs/servers/x11/xorg/builder.sh +++ b/pkgs/servers/x11/xorg/builder.sh @@ -38,12 +38,15 @@ postInstall() { } -installFlags="appdefaultdir=$out/share/X11/app-defaults" +installFlags="appdefaultdir=$out/share/X11/app-defaults $installFlags" if test -n "$x11BuildHook"; then source $x11BuildHook -fi +fi + + +enableParallelBuilding=1 genericBuild diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index a19cb8ee57d..dd90aedc4e2 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -11,58 +11,58 @@ let name = "applewmproto-1.4.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/applewmproto-1.4.1.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/applewmproto-1.4.1.tar.bz2; sha256 = "06fyixmx36qac2qqwmra3l9xr570rankm9kzmk0mgqyhgldrw1h8"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; bdftopcf = (stdenv.mkDerivation ((if overrides ? bdftopcf then overrides.bdftopcf else x: x) { - name = "bdftopcf-1.0.2"; + name = "bdftopcf-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/bdftopcf-1.0.2.tar.bz2; - sha256 = "0sx09m677xjvq88sg4yq21y79zck47bvpzanpll35z9psq6py08i"; + url = mirror://xorg/X11R7.6/src/everything/bdftopcf-1.0.3.tar.bz2; + sha256 = "02hx981f7jfwylxj21s91yvv4h597nqqzz3vd6ar81zyn84b944w"; }; buildInputs = [pkgconfig libXfont ]; })) // {inherit libXfont ;}; bigreqsproto = (stdenv.mkDerivation ((if overrides ? bigreqsproto then overrides.bigreqsproto else x: x) { - name = "bigreqsproto-1.1.0"; + name = "bigreqsproto-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/bigreqsproto-1.1.0.tar.bz2; - sha256 = "1g8725413gz4lj4cc8svqvk4b4r9alj84127xslv16as7hny2r28"; + url = mirror://xorg/X11R7.6/src/everything/bigreqsproto-1.1.1.tar.bz2; + sha256 = "16phzxa55lr749rghpaa699h1lcpndmw7izxzgl1bljq5f3qafqw"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; compositeproto = (stdenv.mkDerivation ((if overrides ? compositeproto then overrides.compositeproto else x: x) { - name = "compositeproto-0.4.1"; + name = "compositeproto-0.4.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/compositeproto-0.4.1.tar.bz2; - sha256 = "1139c3nqrwx9fca3b4xrf07jdl31g25dbq5d7981c50yfdv4ax72"; + url = mirror://xorg/X11R7.6/src/everything/compositeproto-0.4.2.tar.bz2; + sha256 = "1z0crmf669hirw4s7972mmp8xig80kfndja9h559haqbpvq5k4q4"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; damageproto = (stdenv.mkDerivation ((if overrides ? damageproto then overrides.damageproto else x: x) { - name = "damageproto-1.2.0"; + name = "damageproto-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/damageproto-1.2.0.tar.bz2; - sha256 = "13zfd4qni9sw1ym8zd95sk2a39nh50rpwmsnzpbdksif19vm00m5"; + url = mirror://xorg/X11R7.6/src/everything/damageproto-1.2.1.tar.bz2; + sha256 = "0nzwr5pv9hg7c21n995pdiv0zqhs91yz3r8rn3aska4ykcp12z2w"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; dmxproto = (stdenv.mkDerivation ((if overrides ? dmxproto then overrides.dmxproto else x: x) { - name = "dmxproto-2.3"; + name = "dmxproto-2.3.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/dmxproto-2.3.tar.bz2; - sha256 = "1c03qkb7gj1fd84wz5c8kxanvmfpgx06r3j6i4s9wd8z7aj2r21s"; + url = mirror://xorg/individual/proto/dmxproto-2.3.1.tar.bz2; + sha256 = "02b5x9dkgajizm8dqyx2w6hmqx3v25l67mgf35nj6sz0lgk52877"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; @@ -71,398 +71,398 @@ let name = "dri2proto-2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/proto/dri2proto-2.3.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/dri2proto-2.3.tar.bz2; sha256 = "0xz6nf5rrn1fvply5mq7dd1w89r73mggylp9lpzzwdfvl291h55j"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; encodings = (stdenv.mkDerivation ((if overrides ? encodings then overrides.encodings else x: x) { - name = "encodings-1.0.3"; + name = "encodings-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/encodings-1.0.3.tar.bz2; - sha256 = "0lqgp2rmygn0dhmjy658cyv6mq2g7a88z7srfb2mmq7b99npdn87"; + url = mirror://xorg/X11R7.6/src/everything/encodings-1.0.4.tar.bz2; + sha256 = "0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; fixesproto = (stdenv.mkDerivation ((if overrides ? fixesproto then overrides.fixesproto else x: x) { - name = "fixesproto-4.1.1"; + name = "fixesproto-4.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/fixesproto-4.1.1.tar.bz2; - sha256 = "1vv4y5zjlh2x6vbxx1nj770aznrbb1amr57q8wwd1fylda8k4ap7"; + url = mirror://xorg/X11R7.6/src/everything/fixesproto-4.1.2.tar.bz2; + sha256 = "0mzq8kh1v1w2mrl4y82qzgv8jzlr3n4jmss56h3r1h9knp6byk6y"; }; buildInputs = [pkgconfig xextproto ]; })) // {inherit xextproto ;}; fontadobe100dpi = (stdenv.mkDerivation ((if overrides ? fontadobe100dpi then overrides.fontadobe100dpi else x: x) { - name = "font-adobe-100dpi-1.0.2"; + name = "font-adobe-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-adobe-100dpi-1.0.2.tar.bz2; - sha256 = "0xb767577698d9ribv4p4lgi7f8sjb8y6nvd357i5g23404nw0bi"; + url = mirror://xorg/X11R7.6/src/everything/font-adobe-100dpi-1.0.3.tar.bz2; + sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf fontutil mkfontdir ;}; fontadobe75dpi = (stdenv.mkDerivation ((if overrides ? fontadobe75dpi then overrides.fontadobe75dpi else x: x) { - name = "font-adobe-75dpi-1.0.2"; + name = "font-adobe-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-adobe-75dpi-1.0.2.tar.bz2; - sha256 = "1z8h2gq7r553lf1fphk3pya6g4n8rs5f00kffyqdy284j77wlj9d"; + url = mirror://xorg/X11R7.6/src/everything/font-adobe-75dpi-1.0.3.tar.bz2; + sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf fontutil mkfontdir ;}; fontadobeutopia100dpi = (stdenv.mkDerivation ((if overrides ? fontadobeutopia100dpi then overrides.fontadobeutopia100dpi else x: x) { - name = "font-adobe-utopia-100dpi-1.0.3"; + name = "font-adobe-utopia-100dpi-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.3.tar.bz2; - sha256 = "1b4cdjynwzrlsnqfi930gpvbs2mvjrawak801385pf0hfb9x2j70"; + url = mirror://xorg/X11R7.6/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2; + sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf fontutil mkfontdir ;}; fontadobeutopia75dpi = (stdenv.mkDerivation ((if overrides ? fontadobeutopia75dpi then overrides.fontadobeutopia75dpi else x: x) { - name = "font-adobe-utopia-75dpi-1.0.3"; + name = "font-adobe-utopia-75dpi-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.3.tar.bz2; - sha256 = "1qs2jp6vw9j07qk38f0ambjd9g6d3ph4ichfgjjkaymmvd5bwk97"; + url = mirror://xorg/X11R7.6/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2; + sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf fontutil mkfontdir ;}; fontadobeutopiatype1 = (stdenv.mkDerivation ((if overrides ? fontadobeutopiatype1 then overrides.fontadobeutopiatype1 else x: x) { - name = "font-adobe-utopia-type1-1.0.3"; + name = "font-adobe-utopia-type1-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.3.tar.bz2; - sha256 = "1y8h0v15m3j0d83c3rp14bg5shx7kpg34vjaky8gvwndjdr4dyjh"; + url = mirror://xorg/X11R7.6/src/everything/font-adobe-utopia-type1-1.0.4.tar.bz2; + sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit mkfontdir mkfontscale ;}; fontalias = (stdenv.mkDerivation ((if overrides ? fontalias then overrides.fontalias else x: x) { - name = "font-alias-1.0.2"; + name = "font-alias-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-alias-1.0.2.tar.bz2; - sha256 = "0w42ndi73wiyrc9zj7g0syxnfq2x2cncjpchm5pdnpihz7rxd2s3"; + url = mirror://xorg/X11R7.6/src/everything/font-alias-1.0.3.tar.bz2; + sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; fontarabicmisc = (stdenv.mkDerivation ((if overrides ? fontarabicmisc then overrides.fontarabicmisc else x: x) { - name = "font-arabic-misc-1.0.1"; + name = "font-arabic-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-arabic-misc-1.0.1.tar.bz2; - sha256 = "0q3gxbk4wcj1cpw1fhs66vf7ddar8fmkml47g8rlv127zmd31c7l"; + url = mirror://xorg/X11R7.6/src/everything/font-arabic-misc-1.0.3.tar.bz2; + sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; fontbh100dpi = (stdenv.mkDerivation ((if overrides ? fontbh100dpi then overrides.fontbh100dpi else x: x) { - name = "font-bh-100dpi-1.0.1"; + name = "font-bh-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-bh-100dpi-1.0.1.tar.bz2; - sha256 = "15rk3k1w12pidz9373y388zqmbrmw13pmj2aydk35689gd46hvf4"; + url = mirror://xorg/X11R7.6/src/everything/font-bh-100dpi-1.0.3.tar.bz2; + sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf fontutil mkfontdir ;}; fontbh75dpi = (stdenv.mkDerivation ((if overrides ? fontbh75dpi then overrides.fontbh75dpi else x: x) { - name = "font-bh-75dpi-1.0.1"; + name = "font-bh-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-bh-75dpi-1.0.1.tar.bz2; - sha256 = "0h4xnrbznb2vyy950h9iq0fyxgwpdkw5pb2l424g0sgifylpacca"; + url = mirror://xorg/X11R7.6/src/everything/font-bh-75dpi-1.0.3.tar.bz2; + sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf fontutil mkfontdir ;}; fontbhlucidatypewriter100dpi = (stdenv.mkDerivation ((if overrides ? fontbhlucidatypewriter100dpi then overrides.fontbhlucidatypewriter100dpi else x: x) { - name = "font-bh-lucidatypewriter-100dpi-1.0.1"; + name = "font-bh-lucidatypewriter-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-bh-lucidatypewriter-100dpi-1.0.1.tar.bz2; - sha256 = "1acd04cd2ls7c1gihywa2hf67ijm7iz4q5c7q9wd9yx3wp2gfml1"; + url = mirror://xorg/X11R7.6/src/everything/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2; + sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf fontutil mkfontdir ;}; fontbhlucidatypewriter75dpi = (stdenv.mkDerivation ((if overrides ? fontbhlucidatypewriter75dpi then overrides.fontbhlucidatypewriter75dpi else x: x) { - name = "font-bh-lucidatypewriter-75dpi-1.0.1"; + name = "font-bh-lucidatypewriter-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-bh-lucidatypewriter-75dpi-1.0.1.tar.bz2; - sha256 = "0h9qxgb7v6i12qjyc98ry3ym52a602kkpsvycjb6r4f62icrrzr0"; + url = mirror://xorg/X11R7.6/src/everything/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2; + sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf fontutil mkfontdir ;}; fontbhttf = (stdenv.mkDerivation ((if overrides ? fontbhttf then overrides.fontbhttf else x: x) { - name = "font-bh-ttf-1.0.1"; + name = "font-bh-ttf-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-bh-ttf-1.0.1.tar.bz2; - sha256 = "1j57lzrvnzhi56y7nzz4najymgvf093574czjh77zpy4ls22zrqw"; + url = mirror://xorg/X11R7.6/src/everything/font-bh-ttf-1.0.3.tar.bz2; + sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit mkfontdir mkfontscale ;}; fontbhtype1 = (stdenv.mkDerivation ((if overrides ? fontbhtype1 then overrides.fontbhtype1 else x: x) { - name = "font-bh-type1-1.0.1"; + name = "font-bh-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-bh-type1-1.0.1.tar.bz2; - sha256 = "0idvayiwbysvhmrm0870hpw0cy0hgadcfl0zhgrvmq6dqqk5yfys"; + url = mirror://xorg/X11R7.6/src/everything/font-bh-type1-1.0.3.tar.bz2; + sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit mkfontdir mkfontscale ;}; fontbitstream100dpi = (stdenv.mkDerivation ((if overrides ? fontbitstream100dpi then overrides.fontbitstream100dpi else x: x) { - name = "font-bitstream-100dpi-1.0.1"; + name = "font-bitstream-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-bitstream-100dpi-1.0.1.tar.bz2; - sha256 = "0iq3kzabfvdssivhi4vmzhjan535ws48hxgc8rp0xh0d9nvwj19y"; + url = mirror://xorg/X11R7.6/src/everything/font-bitstream-100dpi-1.0.3.tar.bz2; + sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; fontbitstream75dpi = (stdenv.mkDerivation ((if overrides ? fontbitstream75dpi then overrides.fontbitstream75dpi else x: x) { - name = "font-bitstream-75dpi-1.0.1"; + name = "font-bitstream-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-bitstream-75dpi-1.0.1.tar.bz2; - sha256 = "0av66i14x3wj379jkgcjswawkis0imvr31v7wmkaa5qmqaqir7ng"; + url = mirror://xorg/X11R7.6/src/everything/font-bitstream-75dpi-1.0.3.tar.bz2; + sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; fontbitstreamtype1 = (stdenv.mkDerivation ((if overrides ? fontbitstreamtype1 then overrides.fontbitstreamtype1 else x: x) { - name = "font-bitstream-type1-1.0.1"; + name = "font-bitstream-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-bitstream-type1-1.0.1.tar.bz2; - sha256 = "1aqkw51m69k8dlwj3cllnqnfjgvpy59vd8n140v1ah4isk0pq0ji"; + url = mirror://xorg/X11R7.6/src/everything/font-bitstream-type1-1.0.3.tar.bz2; + sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit mkfontdir mkfontscale ;}; fontcronyxcyrillic = (stdenv.mkDerivation ((if overrides ? fontcronyxcyrillic then overrides.fontcronyxcyrillic else x: x) { - name = "font-cronyx-cyrillic-1.0.1"; + name = "font-cronyx-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-cronyx-cyrillic-1.0.1.tar.bz2; - sha256 = "08ilkby85m8pj2nn3hnfawmxzg8gq36fpw4g7r8i2cgyi913md7p"; + url = mirror://xorg/X11R7.6/src/everything/font-cronyx-cyrillic-1.0.3.tar.bz2; + sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; fontcursormisc = (stdenv.mkDerivation ((if overrides ? fontcursormisc then overrides.fontcursormisc else x: x) { - name = "font-cursor-misc-1.0.1"; + name = "font-cursor-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-cursor-misc-1.0.1.tar.bz2; - sha256 = "1cy1gl9xnkab8ddb1krxpisa2c4cr0h47flsir23b8za3f305vny"; + url = mirror://xorg/X11R7.6/src/everything/font-cursor-misc-1.0.3.tar.bz2; + sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; fontdaewoomisc = (stdenv.mkDerivation ((if overrides ? fontdaewoomisc then overrides.fontdaewoomisc else x: x) { - name = "font-daewoo-misc-1.0.1"; + name = "font-daewoo-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-daewoo-misc-1.0.1.tar.bz2; - sha256 = "14g4wqymc0csnpc0qa0pjndl3wqid13ll2vgk1yfqvy6h113wa72"; + url = mirror://xorg/X11R7.6/src/everything/font-daewoo-misc-1.0.3.tar.bz2; + sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; fontdecmisc = (stdenv.mkDerivation ((if overrides ? fontdecmisc then overrides.fontdecmisc else x: x) { - name = "font-dec-misc-1.0.1"; + name = "font-dec-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-dec-misc-1.0.1.tar.bz2; - sha256 = "0lk596dw3yk9wspqy167q72r76pwzph9v4rhx0vf41ywzm5dl87v"; + url = mirror://xorg/X11R7.6/src/everything/font-dec-misc-1.0.3.tar.bz2; + sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; fontibmtype1 = (stdenv.mkDerivation ((if overrides ? fontibmtype1 then overrides.fontibmtype1 else x: x) { - name = "font-ibm-type1-1.0.1"; + name = "font-ibm-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-ibm-type1-1.0.1.tar.bz2; - sha256 = "06f9dihdss70w3h3rdak1zwkr0gdnryfw2lnsi85rp8grjashzl8"; + url = mirror://xorg/X11R7.6/src/everything/font-ibm-type1-1.0.3.tar.bz2; + sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit mkfontdir mkfontscale ;}; fontisasmisc = (stdenv.mkDerivation ((if overrides ? fontisasmisc then overrides.fontisasmisc else x: x) { - name = "font-isas-misc-1.0.1"; + name = "font-isas-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-isas-misc-1.0.1.tar.bz2; - sha256 = "0yza5kqj89b81whkrdhficwryhzfgya4w5p8l33lvscixdlh9zjj"; + url = mirror://xorg/X11R7.6/src/everything/font-isas-misc-1.0.3.tar.bz2; + sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; fontjismisc = (stdenv.mkDerivation ((if overrides ? fontjismisc then overrides.fontjismisc else x: x) { - name = "font-jis-misc-1.0.1"; + name = "font-jis-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-jis-misc-1.0.1.tar.bz2; - sha256 = "1kz8ajxsalxhkqbs9m1icwrqji0972f1knqljaa62nrr0k19hfx6"; + url = mirror://xorg/X11R7.6/src/everything/font-jis-misc-1.0.3.tar.bz2; + sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; fontmicromisc = (stdenv.mkDerivation ((if overrides ? fontmicromisc then overrides.fontmicromisc else x: x) { - name = "font-micro-misc-1.0.1"; + name = "font-micro-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-micro-misc-1.0.1.tar.bz2; - sha256 = "0awpwich27vhaccrqh6rg330yvfaab0d3jm6d0wzclxz73m8gfd5"; + url = mirror://xorg/X11R7.6/src/everything/font-micro-misc-1.0.3.tar.bz2; + sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; fontmisccyrillic = (stdenv.mkDerivation ((if overrides ? fontmisccyrillic then overrides.fontmisccyrillic else x: x) { - name = "font-misc-cyrillic-1.0.1"; + name = "font-misc-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-misc-cyrillic-1.0.1.tar.bz2; - sha256 = "0xdgv2ad4qq1dvp6cy99wmrynri267n8dzbjk5220n6rjgyzpyns"; + url = mirror://xorg/X11R7.6/src/everything/font-misc-cyrillic-1.0.3.tar.bz2; + sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; fontmiscethiopic = (stdenv.mkDerivation ((if overrides ? fontmiscethiopic then overrides.fontmiscethiopic else x: x) { - name = "font-misc-ethiopic-1.0.1"; + name = "font-misc-ethiopic-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-misc-ethiopic-1.0.1.tar.bz2; - sha256 = "0j6rsf5nwgm8afvjr6c3ga5rnhpd2dqhwnczsyr4fh3c9fcklfxz"; + url = mirror://xorg/X11R7.6/src/everything/font-misc-ethiopic-1.0.3.tar.bz2; + sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit mkfontdir mkfontscale ;}; fontmiscmeltho = (stdenv.mkDerivation ((if overrides ? fontmiscmeltho then overrides.fontmiscmeltho else x: x) { - name = "font-misc-meltho-1.0.1"; + name = "font-misc-meltho-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-misc-meltho-1.0.1.tar.bz2; - sha256 = "0616v6pamg41q4yhm7wiaycky49hhkfwvabn8r89w64ayfhdfrjk"; + url = mirror://xorg/X11R7.6/src/everything/font-misc-meltho-1.0.3.tar.bz2; + sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit mkfontdir mkfontscale ;}; fontmiscmisc = (stdenv.mkDerivation ((if overrides ? fontmiscmisc then overrides.fontmiscmisc else x: x) { - name = "font-misc-misc-1.1.0"; + name = "font-misc-misc-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-misc-misc-1.1.0.tar.bz2; - sha256 = "0ys9in88psmxsryci4pq5jj9208jlzamsmfdxw8rlcagp6555xsh"; + url = mirror://xorg/X11R7.6/src/everything/font-misc-misc-1.1.2.tar.bz2; + sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf fontutil mkfontdir ;}; fontmuttmisc = (stdenv.mkDerivation ((if overrides ? fontmuttmisc then overrides.fontmuttmisc else x: x) { - name = "font-mutt-misc-1.0.1"; + name = "font-mutt-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-mutt-misc-1.0.1.tar.bz2; - sha256 = "09bfj00kaf31zncj5k2dm1in5ldp8pmrhrji9vprp16iyp5k7gvp"; + url = mirror://xorg/X11R7.6/src/everything/font-mutt-misc-1.0.3.tar.bz2; + sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; fontschumachermisc = (stdenv.mkDerivation ((if overrides ? fontschumachermisc then overrides.fontschumachermisc else x: x) { - name = "font-schumacher-misc-1.1.0"; + name = "font-schumacher-misc-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-schumacher-misc-1.1.0.tar.bz2; - sha256 = "0k8vvssb2dyr9vwal493zkq7x1d0draffvh8wvjzwc1rnmgr20rh"; + url = mirror://xorg/X11R7.6/src/everything/font-schumacher-misc-1.1.2.tar.bz2; + sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf fontutil mkfontdir ;}; fontscreencyrillic = (stdenv.mkDerivation ((if overrides ? fontscreencyrillic then overrides.fontscreencyrillic else x: x) { - name = "font-screen-cyrillic-1.0.2"; + name = "font-screen-cyrillic-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-screen-cyrillic-1.0.2.tar.bz2; - sha256 = "04dyzq73yq0278pk9ssbhb9ia518djgzj9ybi8snvw9zn4gqipf5"; + url = mirror://xorg/X11R7.6/src/everything/font-screen-cyrillic-1.0.4.tar.bz2; + sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; fontsonymisc = (stdenv.mkDerivation ((if overrides ? fontsonymisc then overrides.fontsonymisc else x: x) { - name = "font-sony-misc-1.0.1"; + name = "font-sony-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-sony-misc-1.0.1.tar.bz2; - sha256 = "1jjnzhxzbk2x1byp77yddcni0myd73sxilqj75fkkkkl9j22d5fs"; + url = mirror://xorg/X11R7.6/src/everything/font-sony-misc-1.0.3.tar.bz2; + sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; fontsproto = (stdenv.mkDerivation ((if overrides ? fontsproto then overrides.fontsproto else x: x) { - name = "fontsproto-2.1.0"; + name = "fontsproto-2.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/fontsproto-2.1.0.tar.bz2; - sha256 = "0dgb7b49h60wvrcpzax1i7wa03lpkl5f6jkfpb4qh90lr4fzd6js"; + url = mirror://xorg/X11R7.6/src/everything/fontsproto-2.1.1.tar.bz2; + sha256 = "1g1rsvj0lb7744x6fj18d989ymf7zgry3v3fzipnnzljwa0vr6lw"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; fontsunmisc = (stdenv.mkDerivation ((if overrides ? fontsunmisc then overrides.fontsunmisc else x: x) { - name = "font-sun-misc-1.0.1"; + name = "font-sun-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-sun-misc-1.0.1.tar.bz2; - sha256 = "02cxmssnri09iz2a673f38x3wj94yn96m55b69s1m5cgxbsj45a1"; + url = mirror://xorg/X11R7.6/src/everything/font-sun-misc-1.0.3.tar.bz2; + sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; fontutil = (stdenv.mkDerivation ((if overrides ? fontutil then overrides.fontutil else x: x) { - name = "font-util-1.1.1"; + name = "font-util-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-util-1.1.1.tar.bz2; - sha256 = "121gq3iiz0hydvcqfh88adrqkky3zs48irjwa31xfgvw1lxiwgx3"; + url = mirror://xorg/X11R7.6/src/everything/font-util-1.2.0.tar.bz2; + sha256 = "04lp7xlrcqfyrsnvdgyqbanlnzr13lhn28v0kr2nzpvcmqbwdfnv"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; fontwinitzkicyrillic = (stdenv.mkDerivation ((if overrides ? fontwinitzkicyrillic then overrides.fontwinitzkicyrillic else x: x) { - name = "font-winitzki-cyrillic-1.0.1"; + name = "font-winitzki-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-winitzki-cyrillic-1.0.1.tar.bz2; - sha256 = "0ihlvf6rsd8hpdyp09zfisvp44sxdddpi3zbld1ya66vf2gw4mvw"; + url = mirror://xorg/X11R7.6/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2; + sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; fontxfree86type1 = (stdenv.mkDerivation ((if overrides ? fontxfree86type1 then overrides.fontxfree86type1 else x: x) { - name = "font-xfree86-type1-1.0.2"; + name = "font-xfree86-type1-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/font-xfree86-type1-1.0.2.tar.bz2; - sha256 = "1k86ryqkhq3rrvsz5w7a28i9n5jv29hx6p5kq6r1k9p5mzm6l0ks"; + url = mirror://xorg/X11R7.6/src/everything/font-xfree86-type1-1.0.4.tar.bz2; + sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit mkfontdir mkfontscale ;}; @@ -478,51 +478,51 @@ let })) // {inherit ;}; glproto = (stdenv.mkDerivation ((if overrides ? glproto then overrides.glproto else x: x) { - name = "glproto-1.4.11"; + name = "glproto-1.4.12"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/proto/glproto-1.4.11.tar.bz2; - sha256 = "0lclh6fnz6k5xqbqarsvzx6sg7gjkprg27k7797xn0agsy4isj7y"; + url = mirror://xorg/X11R7.6/src/everything/glproto-1.4.12.tar.bz2; + sha256 = "1pjpnj78hski4krvsbf55pkhhsrahvlb825dwl804q0b36fpmgj8"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; iceauth = (stdenv.mkDerivation ((if overrides ? iceauth then overrides.iceauth else x: x) { - name = "iceauth-1.0.3"; + name = "iceauth-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/iceauth-1.0.3.tar.bz2; - sha256 = "07nq2y8py2hvp54dklvv9y8l6b76wlmfkw3llh02dnpjr7v3zjmb"; + url = mirror://xorg/X11R7.6/src/everything/iceauth-1.0.4.tar.bz2; + sha256 = "13ck97rz53l490aba3xpgv4psgk4rywh1vi6slg1n4zhai2zvrhf"; }; buildInputs = [pkgconfig libICE xproto ]; })) // {inherit libICE xproto ;}; imake = (stdenv.mkDerivation ((if overrides ? imake then overrides.imake else x: x) { - name = "imake-1.0.3"; + name = "imake-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/imake-1.0.3.tar.bz2; - sha256 = "1sjknp0g39r7ywp44drcrb8r92159a9nxgnjc90mjcksvm2540ch"; + url = mirror://xorg/individual/util/imake-1.0.4.tar.bz2; + sha256 = "1zj6y59yip40hrdvvljjmnsfqddzxpxmbmd8842010rhkvq7zcmc"; }; buildInputs = [pkgconfig xproto ]; })) // {inherit xproto ;}; inputproto = (stdenv.mkDerivation ((if overrides ? inputproto then overrides.inputproto else x: x) { - name = "inputproto-2.0"; + name = "inputproto-2.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/inputproto-2.0.tar.bz2; - sha256 = "1x0sx8ilw857r69ddfr94x66gf8x17284nd20c9hmclajbvmfbs7"; + url = mirror://xorg/X11R7.6/src/everything/inputproto-2.0.1.tar.bz2; + sha256 = "0i2a28bnvv68i6z8qx09iw95c1wchqc2migx1s7764pqipc3srk3"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; kbproto = (stdenv.mkDerivation ((if overrides ? kbproto then overrides.kbproto else x: x) { - name = "kbproto-1.0.4"; + name = "kbproto-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/kbproto-1.0.4.tar.bz2; - sha256 = "0g30x2jgabp3bx6h556f9777dk384xk45zfzh7mw7l0k2f9jkahv"; + url = mirror://xorg/X11R7.6/src/everything/kbproto-1.0.5.tar.bz2; + sha256 = "17glym611bbkca371ihpcnx9ydp4asay4psqq267j00pbr94zfhf"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; @@ -531,38 +531,38 @@ let name = "libAppleWM-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libAppleWM-1.4.0.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/libAppleWM-1.4.0.tar.bz2; sha256 = "10hw7rvwc2b0v3v6mc6vaq8xs6vim4bg43rnhspf4p26mlb2dsf8"; }; buildInputs = [pkgconfig applewmproto libX11 libXext xextproto ]; })) // {inherit applewmproto libX11 libXext xextproto ;}; libFS = (stdenv.mkDerivation ((if overrides ? libFS then overrides.libFS else x: x) { - name = "libFS-1.0.2"; + name = "libFS-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libFS-1.0.2.tar.bz2; - sha256 = "0j9hrqsn808zpr573p6vnpg17p3nk7ry7d6x1ghjdc52xbjmyamg"; + url = mirror://xorg/X11R7.6/src/everything/libFS-1.0.3.tar.bz2; + sha256 = "0694iyc1rdz0fqnalgzpgzmxfaklrdk0jz769fsn1bv88mszjymb"; }; buildInputs = [pkgconfig fontsproto xproto xtrans ]; })) // {inherit fontsproto xproto xtrans ;}; libICE = (stdenv.mkDerivation ((if overrides ? libICE then overrides.libICE else x: x) { - name = "libICE-1.0.6"; + name = "libICE-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libICE-1.0.6.tar.bz2; - sha256 = "12sn3d28figzmszcacbcv4v1k03jdp4g2ca5riza4ajxa1cnhd58"; + url = mirror://xorg/X11R7.6/src/everything/libICE-1.0.7.tar.bz2; + sha256 = "00drapw7n793nqy23m76vxj5yzlgx7prmprkhzp3qiqs2lpnkcd8"; }; buildInputs = [pkgconfig xproto xtrans ]; })) // {inherit xproto xtrans ;}; libSM = (stdenv.mkDerivation ((if overrides ? libSM then overrides.libSM else x: x) { - name = "libSM-1.1.1"; + name = "libSM-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libSM-1.1.1.tar.bz2; - sha256 = "1q3wmblw594vzylndcb20cdq3yjgzpy2xmghyhzin0vaii6ih3gm"; + url = mirror://xorg/X11R7.6/src/everything/libSM-1.2.0.tar.bz2; + sha256 = "1jspgbd9g1d20kl18nnbzv37f1kpfybjff2xn08dmgv7f0dxzn0c"; }; buildInputs = [pkgconfig libICE libuuid xproto xtrans ]; })) // {inherit libICE libuuid xproto xtrans ;}; @@ -571,28 +571,28 @@ let name = "libWindowsWM-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libWindowsWM-1.0.1.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/libWindowsWM-1.0.1.tar.bz2; sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15"; }; buildInputs = [pkgconfig windowswmproto libX11 libXext xextproto ]; })) // {inherit windowswmproto libX11 libXext xextproto ;}; libX11 = (stdenv.mkDerivation ((if overrides ? libX11 then overrides.libX11 else x: x) { - name = "libX11-1.3.4"; + name = "libX11-1.4.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libX11-1.3.4.tar.bz2; - sha256 = "0i58i744fh9jp0wdyifc9ip5ahvanniyfzana0s15kgpwn627mw8"; + url = mirror://xorg/individual/lib/libX11-1.4.1.tar.bz2; + sha256 = "1qiwyqaf9vfn52nwp7nxlbixld3r9jyzsarnkwk0ynk4k3vy1x3h"; }; - buildInputs = [pkgconfig bigreqsproto inputproto kbproto libXau libxcb xcmiscproto libXdmcp xextproto xf86bigfontproto xproto xtrans ]; - })) // {inherit bigreqsproto inputproto kbproto libXau libxcb xcmiscproto libXdmcp xextproto xf86bigfontproto xproto xtrans ;}; + buildInputs = [pkgconfig inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ]; + })) // {inherit inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ;}; libXScrnSaver = (stdenv.mkDerivation ((if overrides ? libXScrnSaver then overrides.libXScrnSaver else x: x) { - name = "libXScrnSaver-1.2.0"; + name = "libXScrnSaver-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libXScrnSaver-1.2.0.tar.bz2; - sha256 = "11bz918c8c2r8m5y5rgm25f0xsq7l46g5rdx4r941dif1zn7n1jv"; + url = mirror://xorg/X11R7.6/src/everything/libXScrnSaver-1.2.1.tar.bz2; + sha256 = "16i59gac2sixgi692w4lvq5cp8hkl6rc375bh0ib51gsyvi6cfnf"; }; buildInputs = [pkgconfig scrnsaverproto libX11 libXext xextproto ]; })) // {inherit scrnsaverproto libX11 libXext xextproto ;}; @@ -601,38 +601,38 @@ let name = "libXau-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXau-1.0.6.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/libXau-1.0.6.tar.bz2; sha256 = "1z3h07wj2kg2hnzj4gd9pc3rkj4n0mfw6f9skg9w1hfwzrgl317f"; }; buildInputs = [pkgconfig xproto ]; })) // {inherit xproto ;}; libXaw = (stdenv.mkDerivation ((if overrides ? libXaw then overrides.libXaw else x: x) { - name = "libXaw-1.0.7"; + name = "libXaw-1.0.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libXaw-1.0.7.tar.bz2; - sha256 = "0a7kqs23c3vwf2gibdm4xw8ylw7fqn0h72c01z4b31lmn3lsw2kl"; + url = mirror://xorg/individual/lib/libXaw-1.0.9.tar.bz2; + sha256 = "0dxh5ldcmzl6afq0a9172ryah1341g0zysm8vk2lmqkqdda7ffd8"; }; buildInputs = [pkgconfig libX11 libXext xextproto libXmu libXpm xproto libXt ]; })) // {inherit libX11 libXext xextproto libXmu libXpm xproto libXt ;}; libXcomposite = (stdenv.mkDerivation ((if overrides ? libXcomposite then overrides.libXcomposite else x: x) { - name = "libXcomposite-0.4.2"; + name = "libXcomposite-0.4.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXcomposite-0.4.2.tar.bz2; - sha256 = "007qcqhp0dhvq2v7nkpz282rbwa6m9pmmpg4ypb30hv8yw5xwas4"; + url = mirror://xorg/X11R7.6/src/everything/libXcomposite-0.4.3.tar.bz2; + sha256 = "1b8sniijb85v4my6v30ma9yqnwl4hkclci9l1hqxnipfyhl4sa9j"; }; - buildInputs = [pkgconfig compositeproto fixesproto libX11 libXext libXfixes xproto ]; - })) // {inherit compositeproto fixesproto libX11 libXext libXfixes xproto ;}; + buildInputs = [pkgconfig compositeproto libX11 libXfixes xproto ]; + })) // {inherit compositeproto libX11 libXfixes xproto ;}; libXcursor = (stdenv.mkDerivation ((if overrides ? libXcursor then overrides.libXcursor else x: x) { - name = "libXcursor-1.1.10"; + name = "libXcursor-1.1.11"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libXcursor-1.1.10.tar.bz2; - sha256 = "1gbcwf5v108m96y9gpghjb3hv7chvibh1k3b9chc7wh34bv6si5r"; + url = mirror://xorg/X11R7.6/src/everything/libXcursor-1.1.11.tar.bz2; + sha256 = "1zpn5dx66l5ql9qv0yz41qlbap4imkkvi0p6j2a6zh72g52zfvm0"; }; buildInputs = [pkgconfig fixesproto libX11 libXfixes xproto libXrender ]; })) // {inherit fixesproto libX11 libXfixes xproto libXrender ;}; @@ -641,28 +641,28 @@ let name = "libXdamage-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXdamage-1.1.3.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/libXdamage-1.1.3.tar.bz2; sha256 = "1a678bwap74sqczbr2z4y4fvbr35km3inkm8bi1igjyk4v46jqdw"; }; buildInputs = [pkgconfig damageproto fixesproto libX11 xextproto libXfixes xproto ]; })) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;}; libXdmcp = (stdenv.mkDerivation ((if overrides ? libXdmcp then overrides.libXdmcp else x: x) { - name = "libXdmcp-1.0.3"; + name = "libXdmcp-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libXdmcp-1.0.3.tar.bz2; - sha256 = "1jvqfcc7cng7qsdqxj1ivbki3id1kkb3mdqn9zgddzi0mqpkl0yq"; + url = mirror://xorg/X11R7.6/src/everything/libXdmcp-1.1.0.tar.bz2; + sha256 = "0wh0q4ih9p3nsxsjjj9a3d03nhiyjggpl7gbavdzsfia36iyk85q"; }; buildInputs = [pkgconfig xproto ]; })) // {inherit xproto ;}; libXext = (stdenv.mkDerivation ((if overrides ? libXext then overrides.libXext else x: x) { - name = "libXext-1.1.2"; + name = "libXext-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXext-1.1.2.tar.bz2; - sha256 = "0x2gzqrdzdzyrw8h9qz4ml8yyplb5ki78pvf17ibdjajkkv0ysmc"; + url = mirror://xorg/X11R7.6/src/everything/libXext-1.2.0.tar.bz2; + sha256 = "1xvgvrbg9lc812zi44hsyr461hiiwy05alckq847ki213qhkxvaa"; }; buildInputs = [pkgconfig libX11 xextproto xproto ]; })) // {inherit libX11 xextproto xproto ;}; @@ -671,88 +671,88 @@ let name = "libXfixes-4.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXfixes-4.0.5.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/libXfixes-4.0.5.tar.bz2; sha256 = "0x4drdxrslxf4vgcfyba0f0fbxg98c8x5dfrl7azakhf8qhd0v1f"; }; buildInputs = [pkgconfig fixesproto libX11 xextproto xproto ]; })) // {inherit fixesproto libX11 xextproto xproto ;}; libXfont = (stdenv.mkDerivation ((if overrides ? libXfont then overrides.libXfont else x: x) { - name = "libXfont-1.4.2"; + name = "libXfont-1.4.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXfont-1.4.2.tar.bz2; - sha256 = "0ns99rhfz29y6bbc8slfaxjr132bb9x072vnhgv2kzfbk62mlpyh"; + url = mirror://xorg/X11R7.6/src/everything/libXfont-1.4.3.tar.bz2; + sha256 = "1k79f8vcibd114ydndvna8axx39bsdaj351f16901lh155jlb4pp"; }; buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ]; })) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; libXft = (stdenv.mkDerivation ((if overrides ? libXft then overrides.libXft else x: x) { - name = "libXft-2.1.14"; + name = "libXft-2.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libXft-2.1.14.tar.bz2; - sha256 = "0phpypmkj0dl9vq7wl0jr207gky4s37sbi7sspgx7jl19dcrs3kh"; + url = mirror://xorg/X11R7.6/src/everything/libXft-2.2.0.tar.bz2; + sha256 = "1cprbz7xnxkb7axblw8sdaw9ibkngmz60d0ypk1drhd0dpjmls68"; }; - buildInputs = [pkgconfig fontconfig freetype libXrender ]; - })) // {inherit fontconfig freetype libXrender ;}; + buildInputs = [pkgconfig fontconfig freetype xproto libXrender ]; + })) // {inherit fontconfig freetype xproto libXrender ;}; libXi = (stdenv.mkDerivation ((if overrides ? libXi then overrides.libXi else x: x) { - name = "libXi-1.3"; + name = "libXi-1.4.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libXi-1.3.tar.bz2; - sha256 = "0jwl19w8ry30v4wyar3fv9xbhzp3fbx1mq6p7c342s1qc068qarn"; + url = mirror://xorg/individual/lib/libXi-1.4.1.tar.bz2; + sha256 = "19i92if8anv5pg2mwyy93jcllk1mgxx5gchi8zkjlk7r604ir7sr"; }; buildInputs = [pkgconfig inputproto libX11 libXext xextproto xproto ]; })) // {inherit inputproto libX11 libXext xextproto xproto ;}; libXinerama = (stdenv.mkDerivation ((if overrides ? libXinerama then overrides.libXinerama else x: x) { - name = "libXinerama-1.1"; + name = "libXinerama-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libXinerama-1.1.tar.bz2; - sha256 = "0d5zf9ksbhmpmzk5iglkvwvxkf69cl0r3m4dr56b8cg1q9s9xlz0"; + url = mirror://xorg/X11R7.6/src/everything/libXinerama-1.1.1.tar.bz2; + sha256 = "17vpsscracg1hza0avrczm9fc7xx3229qhicy101mw6cx2hb9qmv"; }; buildInputs = [pkgconfig libX11 libXext xextproto xineramaproto ]; })) // {inherit libX11 libXext xextproto xineramaproto ;}; libXmu = (stdenv.mkDerivation ((if overrides ? libXmu then overrides.libXmu else x: x) { - name = "libXmu-1.0.5"; + name = "libXmu-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libXmu-1.0.5.tar.bz2; - sha256 = "1mr6f4pqzzdpkqghp6jpb9grgc5z4w8hn0hqhjmcy68hxjqbd4h6"; + url = mirror://xorg/X11R7.6/src/everything/libXmu-1.1.0.tar.bz2; + sha256 = "1b9nkml1mk8yi76bv23cikbfrd7hlp48h710yqgcrpkh7cq1za8g"; }; buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ]; })) // {inherit libX11 libXext xextproto xproto libXt ;}; libXp = (stdenv.mkDerivation ((if overrides ? libXp then overrides.libXp else x: x) { - name = "libXp-1.0.0"; + name = "libXp-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXp-1.0.0.tar.bz2; - sha256 = "1blwrr5zhmwwy87j0svmhv3hc13acyn5j14n5rv0anz81iav2r3y"; + url = mirror://xorg/individual/lib/libXp-1.0.1.tar.bz2; + sha256 = "1lj3cjg9ygbmclxvayy5v88kkndpy9jq6y68p13dc5jn01hg5lbi"; }; buildInputs = [pkgconfig printproto libX11 libXau libXext xextproto ]; })) // {inherit printproto libX11 libXau libXext xextproto ;}; libXpm = (stdenv.mkDerivation ((if overrides ? libXpm then overrides.libXpm else x: x) { - name = "libXpm-3.5.8"; + name = "libXpm-3.5.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libXpm-3.5.8.tar.bz2; - sha256 = "0k1cajiw7ijzphrysr2d4yc5s10822nvkbh4xvhkbqz66am7m9q2"; + url = mirror://xorg/X11R7.6/src/everything/libXpm-3.5.9.tar.bz2; + sha256 = "07k2zpiadck1p986pgksfm5zfdm6h5vjy6p0hv59h1dbkh103pca"; }; buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ]; })) // {inherit libX11 libXext xextproto xproto libXt ;}; libXrandr = (stdenv.mkDerivation ((if overrides ? libXrandr then overrides.libXrandr else x: x) { - name = "libXrandr-1.3.0"; + name = "libXrandr-1.3.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libXrandr-1.3.0.tar.bz2; - sha256 = "0y1fh1jf199kdkx7yl8h9azz468pq2d6dvdk1213l5y5fw7wwqar"; + url = mirror://xorg/X11R7.6/src/everything/libXrandr-1.3.1.tar.bz2; + sha256 = "0qf6aywqk2mgd5hw0nr24xxp5k015aa11sax5yycn14wch4agfv2"; }; buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto xproto libXrender ]; })) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;}; @@ -761,118 +761,118 @@ let name = "libXrender-0.9.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXrender-0.9.6.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/libXrender-0.9.6.tar.bz2; sha256 = "0s567qgys8m6782lbrpvpscm8fkk2jm2717g7s3hm7hhcgib2n3z"; }; buildInputs = [pkgconfig renderproto libX11 xproto ]; })) // {inherit renderproto libX11 xproto ;}; libXres = (stdenv.mkDerivation ((if overrides ? libXres then overrides.libXres else x: x) { - name = "libXres-1.0.4"; + name = "libXres-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libXres-1.0.4.tar.bz2; - sha256 = "1pvjfn3mczr788x4nh877f911w63abx7z29gng7ri1zgf1x5czs5"; + url = mirror://xorg/X11R7.6/src/everything/libXres-1.0.5.tar.bz2; + sha256 = "0nd032jn3im6ar71xm1wgcmb4pa76c73nl8lavdkih609d30y2x0"; }; buildInputs = [pkgconfig resourceproto libX11 libXext xextproto xproto ]; })) // {inherit resourceproto libX11 libXext xextproto xproto ;}; libXt = (stdenv.mkDerivation ((if overrides ? libXt then overrides.libXt else x: x) { - name = "libXt-1.0.8"; + name = "libXt-1.0.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXt-1.0.8.tar.bz2; - sha256 = "0z03nbb0lhxshpnyx2nl9kw0n3civjkag1mfiqf82qc64n0jrxbh"; + url = mirror://xorg/X11R7.6/src/everything/libXt-1.0.9.tar.bz2; + sha256 = "00bbms32fkzrxhdm9kybb2404ad6f3d6v4qgl83py7w09dcipfga"; }; buildInputs = [pkgconfig libICE kbproto libSM libX11 xproto ]; })) // {inherit libICE kbproto libSM libX11 xproto ;}; libXtst = (stdenv.mkDerivation ((if overrides ? libXtst then overrides.libXtst else x: x) { - name = "libXtst-1.1.0"; + name = "libXtst-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libXtst-1.1.0.tar.bz2; - sha256 = "09pblj4h8i6fdl553lsgn511vgygl6jq4dx83chmfsg0g53hyi5x"; + url = mirror://xorg/X11R7.6/src/everything/libXtst-1.2.0.tar.bz2; + sha256 = "022lx3c57pkkw11j2k5s1f5idf53li5qg291766bvxi1nl90jbks"; }; buildInputs = [pkgconfig inputproto recordproto libX11 libXext xextproto libXi ]; })) // {inherit inputproto recordproto libX11 libXext xextproto libXi ;}; libXv = (stdenv.mkDerivation ((if overrides ? libXv then overrides.libXv else x: x) { - name = "libXv-1.0.5"; + name = "libXv-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libXv-1.0.5.tar.bz2; - sha256 = "0430v78igg9hgkf5alj3sb20i7xg88if3pl5r9ybkvzy4bgsyjfm"; + url = mirror://xorg/X11R7.6/src/everything/libXv-1.0.6.tar.bz2; + sha256 = "1vpmr9wnbz990ivarsp5rcmdg483fd2nk695plzlzx5h9dcqw3z2"; }; buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto ]; })) // {inherit videoproto libX11 libXext xextproto xproto ;}; libXvMC = (stdenv.mkDerivation ((if overrides ? libXvMC then overrides.libXvMC else x: x) { - name = "libXvMC-1.0.5"; + name = "libXvMC-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libXvMC-1.0.5.tar.bz2; - sha256 = "0zyyiwrfx303lfcb8av4apbql2r2w34rzc0czq7ayhw3s9lcfi06"; + url = mirror://xorg/X11R7.6/src/everything/libXvMC-1.0.6.tar.bz2; + sha256 = "14ik1kgpnds213dsa16i8cf5qg3hc7vccy9jz4a4ml8zqzlq1nix"; }; buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto libXv ]; })) // {inherit videoproto libX11 libXext xextproto xproto libXv ;}; libXxf86dga = (stdenv.mkDerivation ((if overrides ? libXxf86dga then overrides.libXxf86dga else x: x) { - name = "libXxf86dga-1.1.1"; + name = "libXxf86dga-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libXxf86dga-1.1.1.tar.bz2; - sha256 = "05jnvsl70c1dgvkldrgaqsjq72ar0papprx346w5rwfgbs4zhdwd"; + url = mirror://xorg/X11R7.6/src/everything/libXxf86dga-1.1.2.tar.bz2; + sha256 = "01jsc0jg7mjngfbh3j942595pwbyxf2m9kljy3zb6gyfcbsm59hv"; }; buildInputs = [pkgconfig libX11 libXext xextproto xf86dgaproto xproto ]; })) // {inherit libX11 libXext xextproto xf86dgaproto xproto ;}; libXxf86misc = (stdenv.mkDerivation ((if overrides ? libXxf86misc then overrides.libXxf86misc else x: x) { - name = "libXxf86misc-1.0.2"; + name = "libXxf86misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXxf86misc-1.0.2.tar.bz2; - sha256 = "1cvwjl4f83ic97j9da95x2a7gd0hw5vnv1pxn49d3z1lpyqvcr4f"; + url = mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2; + sha256 = "0nvbq9y6k6m9hxdvg3crycqsnnxf1859wrisqcs37z9fhq044gsn"; }; buildInputs = [pkgconfig libX11 libXext xextproto xf86miscproto xproto ]; })) // {inherit libX11 libXext xextproto xf86miscproto xproto ;}; libXxf86vm = (stdenv.mkDerivation ((if overrides ? libXxf86vm then overrides.libXxf86vm else x: x) { - name = "libXxf86vm-1.1.0"; + name = "libXxf86vm-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libXxf86vm-1.1.0.tar.bz2; - sha256 = "1s4dhgl879hkfys28gl3rflas4ci48kiyx359rzjdi9pndvybibw"; + url = mirror://xorg/X11R7.6/src/everything/libXxf86vm-1.1.1.tar.bz2; + sha256 = "17i342h7a2nqfz4lpk8cay0vc0h4i7nxdc6xli9r7mggk8iykji1"; }; buildInputs = [pkgconfig libX11 libXext xextproto xf86vidmodeproto xproto ]; })) // {inherit libX11 libXext xextproto xf86vidmodeproto xproto ;}; libdmx = (stdenv.mkDerivation ((if overrides ? libdmx then overrides.libdmx else x: x) { - name = "libdmx-1.1.0"; + name = "libdmx-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libdmx-1.1.0.tar.bz2; - sha256 = "1mg2sd8xlwcz6lysdc3zld05a2fa1a4hfxxhbh87cpfc93wah10r"; + url = mirror://xorg/X11R7.6/src/everything/libdmx-1.1.1.tar.bz2; + sha256 = "066yndshwq2nzkd0z0w96wq37rnhb23s6vq50bg4kiqb8y3nxpm6"; }; buildInputs = [pkgconfig dmxproto libX11 libXext xextproto ]; })) // {inherit dmxproto libX11 libXext xextproto ;}; libfontenc = (stdenv.mkDerivation ((if overrides ? libfontenc then overrides.libfontenc else x: x) { - name = "libfontenc-1.0.5"; + name = "libfontenc-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libfontenc-1.0.5.tar.bz2; - sha256 = "001749s6whw04fv0426zk48p0wqn29g2ba5i42kkvbg9641xwg3z"; + url = mirror://xorg/X11R7.6/src/everything/libfontenc-1.1.0.tar.bz2; + sha256 = "1gww1cbi17q15lh2ws6qzspp807issbyk5wlzjmgw6pn880ip2il"; }; buildInputs = [pkgconfig xproto zlib ]; })) // {inherit xproto zlib ;}; libpciaccess = (stdenv.mkDerivation ((if overrides ? libpciaccess then overrides.libpciaccess else x: x) { - name = "libpciaccess-0.12.0"; + name = "libpciaccess-0.12.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libpciaccess-0.12.0.tar.bz2; - sha256 = "0msnx3mcbqgghjscq3z1nh894k71k3bx659iaqlhgaqa3h7c1czn"; + url = mirror://xorg/individual/lib/libpciaccess-0.12.1.tar.bz2; + sha256 = "0i3kdmvl1mcjrkhklpli45sqsy4pvipm6swifbcyxx4cwkqdfiyc"; }; buildInputs = [pkgconfig zlib ]; })) // {inherit zlib ;}; @@ -881,218 +881,208 @@ let name = "libpthread-stubs-0.3"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/libpthread-stubs-0.3.tar.bz2; sha256 = "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; libxcb = (stdenv.mkDerivation ((if overrides ? libxcb then overrides.libxcb else x: x) { - name = "libxcb-1.6"; + name = "libxcb-1.7"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/libxcb-1.6.tar.bz2; - sha256 = "0di9mm6d8wmscgfaw6sfa8znrk522y8dnl4xhy87wqx4fhbwirhs"; + url = mirror://xorg/X11R7.6/src/everything/libxcb-1.7.tar.bz2; + sha256 = "1pr40wa3i1f0iwx83c8alcycy9sfzd2y1qlc63kr8q56w8sxqxp7"; }; buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ]; })) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;}; libxkbfile = (stdenv.mkDerivation ((if overrides ? libxkbfile then overrides.libxkbfile else x: x) { - name = "libxkbfile-1.0.6"; + name = "libxkbfile-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libxkbfile-1.0.6.tar.bz2; - sha256 = "0fb0l221m5fsifydrih3fg6ndlsrm0d4fa53cx0rk0i7dcgkr91c"; + url = mirror://xorg/X11R7.6/src/everything/libxkbfile-1.0.7.tar.bz2; + sha256 = "1r9a1xnn57431hfp1am2r5h23pa1zh646482li3vd5ivfc53fzk6"; }; buildInputs = [pkgconfig kbproto libX11 ]; })) // {inherit kbproto libX11 ;}; lndir = (stdenv.mkDerivation ((if overrides ? lndir then overrides.lndir else x: x) { - name = "lndir-1.0.1"; + name = "lndir-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/lndir-1.0.1.tar.bz2; - sha256 = "0a84q8m3x8qbyrhx7r2k7wmhdb5588vcb1r21ifkx8yaaw1360fk"; + url = mirror://xorg/individual/util/lndir-1.0.2.tar.bz2; + sha256 = "1d988z0ywy2k53s7i43ff0j5qac1cpy9j0gjwmiprq66w8rh24z5"; }; buildInputs = [pkgconfig xproto ]; })) // {inherit xproto ;}; luit = (stdenv.mkDerivation ((if overrides ? luit then overrides.luit else x: x) { - name = "luit-1.0.4"; + name = "luit-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/luit-1.0.4.tar.bz2; - sha256 = "0ll2rcg65h0gd18jkj56kbp9j7816j0cnycxz1h20razjw0da76i"; + url = mirror://xorg/X11R7.6/src/everything/luit-1.1.0.tar.bz2; + sha256 = "1l83b5yknh4svqzwsppvmm2q9l0mvsfwm16ik7q3yss8m5zgvypi"; }; - buildInputs = [pkgconfig libfontenc libX11 zlib ]; - })) // {inherit libfontenc libX11 zlib ;}; + buildInputs = [pkgconfig libfontenc zlib ]; + })) // {inherit libfontenc zlib ;}; makedepend = (stdenv.mkDerivation ((if overrides ? makedepend then overrides.makedepend else x: x) { - name = "makedepend-1.0.2"; + name = "makedepend-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/makedepend-1.0.2.tar.bz2; - sha256 = "0mvnjrx161wrzn602c3fd012fixsi8j74dvqahk5nz1dlf8b18j1"; + url = mirror://xorg/X11R7.6/src/everything/makedepend-1.0.3.tar.bz2; + sha256 = "0dxpz376bvphjg8q0nqrcf4y0dbni0c6jj5y16qymr37wlq1s99s"; }; buildInputs = [pkgconfig xproto ]; })) // {inherit xproto ;}; mkfontdir = (stdenv.mkDerivation ((if overrides ? mkfontdir then overrides.mkfontdir else x: x) { - name = "mkfontdir-1.0.5"; + name = "mkfontdir-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/mkfontdir-1.0.5.tar.bz2; - sha256 = "02rd3b8gp3dxfws2fff07fcxm0z2rlbdhxqm23wijdjhzw66ad55"; + url = mirror://xorg/X11R7.6/src/everything/mkfontdir-1.0.6.tar.bz2; + sha256 = "0nf8p0zsndd9qmrw70h2wdq7sz6j066q73lpp262dlpq21inrmam"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; mkfontscale = (stdenv.mkDerivation ((if overrides ? mkfontscale then overrides.mkfontscale else x: x) { - name = "mkfontscale-1.0.7"; + name = "mkfontscale-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/mkfontscale-1.0.7.tar.bz2; - sha256 = "09vivvbw6hbx7n1aq4k4gp23g3pp1bv1zjw2cmm22cx2rhlv41l3"; + url = mirror://xorg/X11R7.6/src/everything/mkfontscale-1.0.8.tar.bz2; + sha256 = "1yah41gr5hlihbjm5l1kykdqj1p5rx6y4vrqraxbzvkrrn37gdbf"; }; buildInputs = [pkgconfig libfontenc freetype xproto zlib ]; })) // {inherit libfontenc freetype xproto zlib ;}; pixman = (stdenv.mkDerivation ((if overrides ? pixman then overrides.pixman else x: x) { - name = "pixman-0.18.2"; + name = "pixman-0.20.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/pixman-0.18.2.tar.bz2; - sha256 = "08rr88cy33k427vyxryxa9yssfy6j9s9m1vcvqmjl2949qv63818"; + url = mirror://xorg/individual/lib/pixman-0.20.2.tar.bz2; + sha256 = "1agl6f63y2wiqr6n9slzhisnilcg8byafp2l8wmw713bk8k6yc9h"; }; buildInputs = [pkgconfig perl ]; })) // {inherit perl ;}; - pixman_0_20_0 = (stdenv.mkDerivation ((if overrides ? pixman then overrides.pixman else x: x) { - name = "pixman-0.20.0"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/individual/lib/pixman-0.20.0.tar.bz2; - sha256 = "1dc804v98222n5awx1x1inwwdp6p7yksiw5yr8jip2pk3fbak627"; - }; - buildInputs = [pkgconfig perl ]; - })) // {inherit perl ;}; - printproto = (stdenv.mkDerivation ((if overrides ? printproto then overrides.printproto else x: x) { - name = "printproto-1.0.4"; + name = "printproto-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/proto/printproto-1.0.4.tar.bz2; - sha256 = "1gnkpz8iyl27gyjvy8rhm9v6g5qvz3632pn5djxks577i0qsjngh"; + url = mirror://xorg/individual/proto/printproto-1.0.5.tar.bz2; + sha256 = "06liap8n4s25sgp27d371cc7yg9a08dxcr3pmdjp761vyin3360j"; }; buildInputs = [pkgconfig libXau ]; })) // {inherit libXau ;}; randrproto = (stdenv.mkDerivation ((if overrides ? randrproto then overrides.randrproto else x: x) { - name = "randrproto-1.3.1"; + name = "randrproto-1.3.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/randrproto-1.3.1.tar.bz2; - sha256 = "1jl5k46lq4p1jv4mfdpj8zp4m79wzfnyxq97dbd4a2kimv0a6g6r"; + url = mirror://xorg/X11R7.6/src/everything/randrproto-1.3.2.tar.bz2; + sha256 = "0wfwcq85wbm0g5r0snc7prgki1wi3kxrxhcxinyr54n45ihh03fr"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; recordproto = (stdenv.mkDerivation ((if overrides ? recordproto then overrides.recordproto else x: x) { - name = "recordproto-1.14"; + name = "recordproto-1.14.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/recordproto-1.14.tar.bz2; - sha256 = "0ryhd6g2h7bg7vzf7dvfgf3n2bbscpqhr9x01alkxamxs9dkglhv"; + url = mirror://xorg/X11R7.6/src/everything/recordproto-1.14.1.tar.bz2; + sha256 = "1389fc3r8h8xqix11y9ngw7a13i1mvw68jkhicgvq676sd1v0zmj"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; renderproto = (stdenv.mkDerivation ((if overrides ? renderproto then overrides.renderproto else x: x) { - name = "renderproto-0.11"; + name = "renderproto-0.11.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/renderproto-0.11.tar.bz2; - sha256 = "1hpzxlmk4hylriqx10h9ixq64ksk3lbhr2cli8r9mvdnn3cxdlf4"; + url = mirror://xorg/X11R7.6/src/everything/renderproto-0.11.1.tar.bz2; + sha256 = "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; resourceproto = (stdenv.mkDerivation ((if overrides ? resourceproto then overrides.resourceproto else x: x) { - name = "resourceproto-1.1.0"; + name = "resourceproto-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/resourceproto-1.1.0.tar.bz2; - sha256 = "0sxk97siq4qkm4r0q6c4fdb7glbasbbx1lj4p0dis574cyq9m3a0"; + url = mirror://xorg/X11R7.6/src/everything/resourceproto-1.1.1.tar.bz2; + sha256 = "1imqlkvn4mfjsflwvqx8dj0n7i7frdpzkdafq001r25ak6782yc5"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; scrnsaverproto = (stdenv.mkDerivation ((if overrides ? scrnsaverproto then overrides.scrnsaverproto else x: x) { - name = "scrnsaverproto-1.2.0"; + name = "scrnsaverproto-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/scrnsaverproto-1.2.0.tar.bz2; - sha256 = "16adwjq9cnf15a4gv87c0s1kkwm1w1k3lg1s6nmhszk128r0mbyy"; + url = mirror://xorg/X11R7.6/src/everything/scrnsaverproto-1.2.1.tar.bz2; + sha256 = "1w94c1an7cy9v68289xbqszaj6g5qx5a29qx67fwsvqkmhygglps"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; sessreg = (stdenv.mkDerivation ((if overrides ? sessreg then overrides.sessreg else x: x) { - name = "sessreg-1.0.5"; + name = "sessreg-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/sessreg-1.0.5.tar.bz2; - sha256 = "1afir60wikx4xx0d5mbk01s5p5l4wk6y37gfiy0vnlwd078gn21k"; + url = mirror://xorg/X11R7.6/src/everything/sessreg-1.0.6.tar.bz2; + sha256 = "143ivrs2pbkid4wr1hri9221z4gi9dlkq7x60jarcz9bhiq1dwvk"; }; buildInputs = [pkgconfig xproto ]; })) // {inherit xproto ;}; setxkbmap = (stdenv.mkDerivation ((if overrides ? setxkbmap then overrides.setxkbmap else x: x) { - name = "setxkbmap-1.1.0"; + name = "setxkbmap-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/setxkbmap-1.1.0.tar.bz2; - sha256 = "0r5g9wyyywp90hclhvqkiq6nbgrs0wrwcqvds76dzxjb98qjnbwk"; + url = mirror://xorg/X11R7.6/src/everything/setxkbmap-1.2.0.tar.bz2; + sha256 = "0fdfvc0fqdp11ly5iywrsi4w7rln4dq02b0b91yjmjm83fzr35cr"; }; buildInputs = [pkgconfig libX11 libxkbfile ]; })) // {inherit libX11 libxkbfile ;}; smproxy = (stdenv.mkDerivation ((if overrides ? smproxy then overrides.smproxy else x: x) { - name = "smproxy-1.0.3"; + name = "smproxy-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/smproxy-1.0.3.tar.bz2; - sha256 = "0ddfsh2mf938xvac6179cnf8n8n47njb8xyrlyjc43r8hdad538v"; + url = mirror://xorg/X11R7.6/src/everything/smproxy-1.0.4.tar.bz2; + sha256 = "0wj4z4ars9j4k5pysl42jpx4zclrz3ifwgqxrcdlmb3l5xvyb4ip"; }; - buildInputs = [pkgconfig libXmu libXt ]; - })) // {inherit libXmu libXt ;}; + buildInputs = [pkgconfig libSM libXmu libXt ]; + })) // {inherit libSM libXmu libXt ;}; twm = (stdenv.mkDerivation ((if overrides ? twm then overrides.twm else x: x) { - name = "twm-1.0.4"; + name = "twm-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/twm-1.0.4.tar.bz2; - sha256 = "1yp1inyglf818pp4rjh250zva4i2jip79m3vkf90h593mvwqi86s"; + url = mirror://xorg/individual/app/twm-1.0.6.tar.bz2; + sha256 = "1scly9kv3kx8zh8bfljsdd32dsb4j05xzn8c5x270xcshzbwmp77"; }; buildInputs = [pkgconfig libICE libSM libX11 libXext libXmu libXt ]; })) // {inherit libICE libSM libX11 libXext libXmu libXt ;}; utilmacros = (stdenv.mkDerivation ((if overrides ? utilmacros then overrides.utilmacros else x: x) { - name = "util-macros-1.10.0"; + name = "util-macros-1.11.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/util-macros-1.10.0.tar.bz2; - sha256 = "0a8in00qqyksij66wgk1m1cp6n4lii88a0c6g1s7cqshwp5b6lmr"; + url = mirror://xorg/X11R7.6/src/everything/util-macros-1.11.0.tar.bz2; + sha256 = "1kya7z5rad93zmc0ij7jhl3shh1k37szmjg1rv75lizqlib4slz8"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; videoproto = (stdenv.mkDerivation ((if overrides ? videoproto then overrides.videoproto else x: x) { - name = "videoproto-2.3.0"; + name = "videoproto-2.3.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/videoproto-2.3.0.tar.bz2; - sha256 = "0pq46hgnrx459v7rlskzk50qi7llk358j9csbbrxcq0vb97cjasg"; + url = mirror://xorg/X11R7.6/src/everything/videoproto-2.3.1.tar.bz2; + sha256 = "0nk3i6gwkqq1w8zwn7bxz344pi1dwcjrmf6hr330h7hxjcj6viry"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; @@ -1101,48 +1091,48 @@ let name = "windowswmproto-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/windowswmproto-1.0.4.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/windowswmproto-1.0.4.tar.bz2; sha256 = "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; x11perf = (stdenv.mkDerivation ((if overrides ? x11perf then overrides.x11perf else x: x) { - name = "x11perf-1.5.1"; + name = "x11perf-1.5.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/x11perf-1.5.1.tar.bz2; - sha256 = "0mkhzxvjn9n5ax013wj3lz7jmlm07l57ds2vxy2r9ylkkxbnlk5b"; + url = mirror://xorg/individual/app/x11perf-1.5.3.tar.bz2; + sha256 = "1g91ksfrvj59hvxvfj1xb730aqscg5wdnc3grrab1wz7mxap6k9r"; }; buildInputs = [pkgconfig libX11 libXext libXft libXmu libXrender ]; })) // {inherit libX11 libXext libXft libXmu libXrender ;}; xauth = (stdenv.mkDerivation ((if overrides ? xauth then overrides.xauth else x: x) { - name = "xauth-1.0.4"; + name = "xauth-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xauth-1.0.4.tar.bz2; - sha256 = "0nba0xg19y124cswy37ds5dmxfw4avd303xhhq5jf65vp34904gr"; + url = mirror://xorg/X11R7.6/src/everything/xauth-1.0.5.tar.bz2; + sha256 = "0v3lmm3qil8shgm7731pl0wd32kpq7w73w5d4mjq1bqxzw09a4vd"; }; buildInputs = [pkgconfig libX11 libXau libXext libXmu ]; })) // {inherit libX11 libXau libXext libXmu ;}; xbacklight = (stdenv.mkDerivation ((if overrides ? xbacklight then overrides.xbacklight else x: x) { - name = "xbacklight-1.1.1"; + name = "xbacklight-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xbacklight-1.1.1.tar.bz2; - sha256 = "1ckgc3mbi5z3wv1fa9nf4yv028xh9911qkqz4f4h171vr28xhcjx"; + url = mirror://xorg/X11R7.6/src/everything/xbacklight-1.1.2.tar.bz2; + sha256 = "02b5jfys2msla2yvg5s0knzyxg2104r25czkwd49i8g8kp804bxg"; }; - buildInputs = [pkgconfig libX11 libXrandr libXrender ]; - })) // {inherit libX11 libXrandr libXrender ;}; + buildInputs = [pkgconfig libX11 libXrandr ]; + })) // {inherit libX11 libXrandr ;}; xbitmaps = (stdenv.mkDerivation ((if overrides ? xbitmaps then overrides.xbitmaps else x: x) { - name = "xbitmaps-1.1.0"; + name = "xbitmaps-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xbitmaps-1.1.0.tar.bz2; - sha256 = "0qc7mmljabh06s4vkz9nkrca1d3f5yr7nr3927pbfdh6iff0b8n9"; + url = mirror://xorg/X11R7.6/src/everything/xbitmaps-1.1.1.tar.bz2; + sha256 = "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; @@ -1151,7 +1141,7 @@ let name = "xcb-proto-1.6"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-proto-1.6.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/xcb-proto-1.6.tar.bz2; sha256 = "18jwkgd2ayvd0zzwawnbh86b4xqjq29mgsq44h06yj8jkcaw2azm"; }; buildInputs = [pkgconfig python ]; @@ -1161,58 +1151,58 @@ let name = "xcb-util-0.3.6"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-util-0.3.6.tar.bz2; + url = mirror://xorg/individual/xcb/xcb-util-0.3.6.tar.bz2; sha256 = "0mqfyq6skm19hhfmd5kmcn0v4di4pmbdszmbf2lmhn01mc8yxf7z"; }; buildInputs = [pkgconfig gperf m4 libxcb xproto ]; })) // {inherit gperf m4 libxcb xproto ;}; xclock = (stdenv.mkDerivation ((if overrides ? xclock then overrides.xclock else x: x) { - name = "xclock-1.0.4"; + name = "xclock-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xclock-1.0.4.tar.bz2; - sha256 = "1w7dwrxjwhllynvkvms236jnls8aik8g755kbpycj4aj62v07fb9"; + url = mirror://xorg/individual/app/xclock-1.0.5.tar.bz2; + sha256 = "16jcmsmhz503mqv7wz7daqqhm11phsws0g7fryzlz0gk4jg1daak"; }; - buildInputs = [pkgconfig libX11 libXaw libXft libxkbfile libXrender libXt ]; - })) // {inherit libX11 libXaw libXft libxkbfile libXrender libXt ;}; + buildInputs = [pkgconfig libX11 libXaw libXft libxkbfile libXmu libXrender libXt ]; + })) // {inherit libX11 libXaw libXft libxkbfile libXmu libXrender libXt ;}; xcmiscproto = (stdenv.mkDerivation ((if overrides ? xcmiscproto then overrides.xcmiscproto else x: x) { - name = "xcmiscproto-1.2.0"; + name = "xcmiscproto-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xcmiscproto-1.2.0.tar.bz2; - sha256 = "13pnmizik323jdzdrhf3vyibmf63qmv4wcly8smyki85f1mw05yy"; + url = mirror://xorg/X11R7.6/src/everything/xcmiscproto-1.2.1.tar.bz2; + sha256 = "05acy1axzkrq6z9xlbmz1kg66lbgfqzky8v4qfdl16gv5gi2f3kk"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; xcmsdb = (stdenv.mkDerivation ((if overrides ? xcmsdb then overrides.xcmsdb else x: x) { - name = "xcmsdb-1.0.2"; + name = "xcmsdb-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xcmsdb-1.0.2.tar.bz2; - sha256 = "1kps2q1gr9l168agqmsk6l9xp2b01qbs9j7i0wb4lkga6ikcdjmz"; + url = mirror://xorg/X11R7.6/src/everything/xcmsdb-1.0.3.tar.bz2; + sha256 = "102s9lsghdp5n3bsg4chlkhrk0jh0kxvg2g0pyi1zmzfy5hd0dxj"; }; buildInputs = [pkgconfig libX11 ]; })) // {inherit libX11 ;}; xcursorgen = (stdenv.mkDerivation ((if overrides ? xcursorgen then overrides.xcursorgen else x: x) { - name = "xcursorgen-1.0.3"; + name = "xcursorgen-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xcursorgen-1.0.3.tar.bz2; - sha256 = "0m62paz36b38bx9xpb79qmf9im1yamgmlvj0hp5gy88wi3z3ypzd"; + url = mirror://xorg/X11R7.6/src/everything/xcursorgen-1.0.4.tar.bz2; + sha256 = "07azdw6w18hdgrd6z3nawrhn1m18nyp24cz54ih91vpz8hpxnany"; }; buildInputs = [pkgconfig libpng libX11 libXcursor ]; })) // {inherit libpng libX11 libXcursor ;}; xcursorthemes = (stdenv.mkDerivation ((if overrides ? xcursorthemes then overrides.xcursorthemes else x: x) { - name = "xcursor-themes-1.0.2"; + name = "xcursor-themes-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xcursor-themes-1.0.2.tar.bz2; - sha256 = "1mhlfnjdq5c0h9k2h088fq82bdsr0g2001x4l2gw15173lpqqyaz"; + url = mirror://xorg/X11R7.6/src/everything/xcursor-themes-1.0.3.tar.bz2; + sha256 = "1is4bak0qkkhv63mfa5l7492r475586y52yzfxyv3psppn662ilr"; }; buildInputs = [pkgconfig libXcursor ]; })) // {inherit libXcursor ;}; @@ -1228,51 +1218,51 @@ let })) // {inherit libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ;}; xdpyinfo = (stdenv.mkDerivation ((if overrides ? xdpyinfo then overrides.xdpyinfo else x: x) { - name = "xdpyinfo-1.1.0"; + name = "xdpyinfo-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xdpyinfo-1.1.0.tar.bz2; - sha256 = "0c86d890bbdswhpnknlfn1xg5xbjgymjhnfk4vp44gv5cpz8s3bq"; + url = mirror://xorg/X11R7.6/src/everything/xdpyinfo-1.2.0.tar.bz2; + sha256 = "1kmmfawcjxgmp06jb3w7d0pxbrcxrrgfx3m1lbwj3gygir4ssnzy"; }; - buildInputs = [pkgconfig libdmx libX11 libXcomposite libXext libXi libXinerama libXp libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ]; - })) // {inherit libdmx libX11 libXcomposite libXext libXi libXinerama libXp libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;}; + buildInputs = [pkgconfig libdmx libX11 libXcomposite libXext libXi libXinerama libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ]; + })) // {inherit libdmx libX11 libXcomposite libXext libXi libXinerama libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;}; xdriinfo = (stdenv.mkDerivation ((if overrides ? xdriinfo then overrides.xdriinfo else x: x) { - name = "xdriinfo-1.0.3"; + name = "xdriinfo-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xdriinfo-1.0.3.tar.bz2; - sha256 = "1715vk6vhxdsn7ir3gd2gy90b4d31llddkysssgxg66713yjlxib"; + url = mirror://xorg/X11R7.6/src/everything/xdriinfo-1.0.4.tar.bz2; + sha256 = "076bjix941znyjmh3j5jjsnhp2gv2iq53d0ks29mvvv87cyy9iim"; }; buildInputs = [pkgconfig glproto libX11 ]; })) // {inherit glproto libX11 ;}; xev = (stdenv.mkDerivation ((if overrides ? xev then overrides.xev else x: x) { - name = "xev-1.0.4"; + name = "xev-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xev-1.0.4.tar.bz2; - sha256 = "1s7x06jw3y6blq4nfgm8m55jphp933idwcs6yivyc956anbrrbbz"; + url = mirror://xorg/X11R7.6/src/everything/xev-1.1.0.tar.bz2; + sha256 = "1ih1rxf2b6bpsggvbx4ibyx70bzgcyjl98l1894d0smjxmlc4n9q"; }; buildInputs = [pkgconfig libX11 ]; })) // {inherit libX11 ;}; xextproto = (stdenv.mkDerivation ((if overrides ? xextproto then overrides.xextproto else x: x) { - name = "xextproto-7.1.1"; + name = "xextproto-7.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xextproto-7.1.1.tar.bz2; - sha256 = "16adjr7hfzf5qaikrq7341p2g6n2nj8gvxgc9jr2qz6mvlqvs2kd"; + url = mirror://xorg/X11R7.6/src/everything/xextproto-7.1.2.tar.bz2; + sha256 = "16ci2mc9g85fsb7lgml349rbgf97v7l9688by71agv682bhjky7n"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; xeyes = (stdenv.mkDerivation ((if overrides ? xeyes then overrides.xeyes else x: x) { - name = "xeyes-1.1.0"; + name = "xeyes-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xeyes-1.1.0.tar.bz2; - sha256 = "01ymjkdhz0jrra47l1cqc4vkklaw3frmzgwwvq6jyvm0zr0rcswr"; + url = mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2; + sha256 = "08d5x2kar5kg4yammw6hhk10iva6jmh8cqq176a1z7nm1il9hplp"; }; buildInputs = [pkgconfig libX11 libXext libXmu libXrender libXt ]; })) // {inherit libX11 libXext libXmu libXrender libXt ;}; @@ -1281,7 +1271,7 @@ let name = "xf86bigfontproto-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86bigfontproto-1.2.0.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/xf86bigfontproto-1.2.0.tar.bz2; sha256 = "0j0n7sj5xfjpmmgx6n5x556rw21hdd18fwmavp95wps7qki214ms"; }; buildInputs = [pkgconfig ]; @@ -1291,18 +1281,18 @@ let name = "xf86dgaproto-2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86dgaproto-2.1.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/xf86dgaproto-2.1.tar.bz2; sha256 = "0l4hx48207mx0hp09026r6gy9nl3asbq0c75hri19wp1118zcpmc"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; xf86driproto = (stdenv.mkDerivation ((if overrides ? xf86driproto then overrides.xf86driproto else x: x) { - name = "xf86driproto-2.1.0"; + name = "xf86driproto-2.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86driproto-2.1.0.tar.bz2; - sha256 = "1gp1vkzypwnd9lvn23vzazl6xxm77vgsgmkyi4p5hgnhzzg14gyj"; + url = mirror://xorg/individual/proto/xf86driproto-2.1.1.tar.bz2; + sha256 = "07v69m0g2dfzb653jni4x656jlr7l84c1k39j8qc8vfb45r8sjww"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; @@ -1311,73 +1301,69 @@ let name = "xf86-input-acecad-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-input-acecad-1.4.0.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/xf86-input-acecad-1.4.0.tar.bz2; sha256 = "0mnmvffxwgcvsa208vffsqlai7lldjc46rdk6j0j4q00df5isd28"; }; buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; })) // {inherit inputproto randrproto xorgserver xproto ;}; xf86inputaiptek = (stdenv.mkDerivation ((if overrides ? xf86inputaiptek then overrides.xf86inputaiptek else x: x) { - name = "xf86-input-aiptek-1.3.0"; + name = "xf86-input-aiptek-1.3.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-input-aiptek-1.3.0.tar.bz2; - sha256 = "0p2ygfh883wbwk5n1ippd7f562bwrsvbpgriqwvw7zqx0axkazxk"; + url = mirror://xorg/X11R7.6/src/everything/xf86-input-aiptek-1.3.1.tar.bz2; + sha256 = "16pby473s65lfd2v60fwayzfhf1n6x696lrx720zwb2p22rlsna3"; }; buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; })) // {inherit inputproto randrproto xorgserver xproto ;}; xf86inputevdev = (stdenv.mkDerivation ((if overrides ? xf86inputevdev then overrides.xf86inputevdev else x: x) { - name = "xf86-input-evdev-2.5.0"; + name = "xf86-input-evdev-2.6.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-evdev-2.5.0.tar.bz2; - sha256 = "0cq34rk3fqlbjnakwzw2138xvwzmf52ffy9grgsrxl6qr4x1gv4x"; + url = mirror://xorg/individual/driver/xf86-input-evdev-2.6.0.tar.bz2; + sha256 = "1b2kcxm7bc255ym56dpl1fw3km44f5ny3hwn65sa90w13acz7rxh"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; })) // {inherit inputproto xorgserver xproto ;}; xf86inputjoystick = (stdenv.mkDerivation ((if overrides ? xf86inputjoystick then overrides.xf86inputjoystick else x: x) { - name = "xf86-input-joystick-1.4.99.2"; + name = "xf86-input-joystick-1.5.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-input-joystick-1.4.99.2.tar.bz2; - sha256 = "1fsjabi8221wi1xnqla1kdawng91h6s8nkhh992jsdk0hlxfj93j"; + url = mirror://xorg/X11R7.6/src/everything/xf86-input-joystick-1.5.0.tar.bz2; + sha256 = "1ac2lap4npylyzg0pi0zy0n48wvicgz9kw0z9ih9ylk9sz2ii0bi"; }; buildInputs = [pkgconfig inputproto kbproto xorgserver xproto ]; })) // {inherit inputproto kbproto xorgserver xproto ;}; xf86inputkeyboard = (stdenv.mkDerivation ((if overrides ? xf86inputkeyboard then overrides.xf86inputkeyboard else x: x) { - name = "xf86-input-keyboard-1.4.0"; + name = "xf86-input-keyboard-1.5.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-input-keyboard-1.4.0.tar.bz2; - sha256 = "19fnlr555pf5y0s01mlhski6v9rvsjzp6b2n5i7sppb8rb7kcbc4"; + url = mirror://xorg/X11R7.6/src/everything/xf86-input-keyboard-1.5.0.tar.bz2; + sha256 = "1c4ww4yj23shqwhc52r512qsy5baf1sxsb7jj7pfnralj07520r3"; }; - buildInputs = [pkgconfig inputproto kbproto randrproto xorgserver xproto ]; - })) // {inherit inputproto kbproto randrproto xorgserver xproto ;}; + buildInputs = [pkgconfig inputproto xorgserver xproto ]; + })) // {inherit inputproto xorgserver xproto ;}; xf86inputmouse = (stdenv.mkDerivation ((if overrides ? xf86inputmouse then overrides.xf86inputmouse else x: x) { - name = "xf86-input-mouse-1.5.0"; + name = "xf86-input-mouse-1.6.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-input-mouse-1.5.0.tar.bz2; - sha256 = "15xk3a6ld9zphqhfm1w69cmnsd13fz8k9xx70w7b4bxbf84f40zk"; + url = mirror://xorg/X11R7.6/src/everything/xf86-input-mouse-1.6.0.tar.bz2; + sha256 = "1nzvlbhvdyki3h1s4x2i3ps1immf3wfns6az2i3669v8a5g29bn7"; }; - buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; - })) // {inherit inputproto randrproto xorgserver xproto ;}; + buildInputs = [pkgconfig inputproto xorgserver xproto ]; + })) // {inherit inputproto xorgserver xproto ;}; xf86inputsynaptics = (stdenv.mkDerivation ((if overrides ? xf86inputsynaptics then overrides.xf86inputsynaptics else x: x) { name = "xf86-input-synaptics-1.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-synaptics-1.3.0.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/xf86-input-synaptics-1.3.0.tar.bz2; sha256 = "1mwgb85qjyzx2yfi7jhgvd435zdyqxyq9aqwlsldmlpkqi8358rh"; }; - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${xorgserver}/include/xorg" - ''; - configureFlags = [ "--with-xorg-conf-dir=$out/share/X11/xorg.conf.d" ]; buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; })) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;}; @@ -1385,18 +1371,18 @@ let name = "xf86-input-vmmouse-12.6.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-vmmouse-12.6.10.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/xf86-input-vmmouse-12.6.10.tar.bz2; sha256 = "0409lkwk1ws8vw4axxilwmcs8qxj8lq5dma2i2iz49q6hrd9sdm6"; }; buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; })) // {inherit inputproto randrproto xorgserver xproto ;}; xf86inputvoid = (stdenv.mkDerivation ((if overrides ? xf86inputvoid then overrides.xf86inputvoid else x: x) { - name = "xf86-input-void-1.3.0"; + name = "xf86-input-void-1.3.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-input-void-1.3.0.tar.bz2; - sha256 = "03qk5gaw8msmi39m6024p61b0faw91b3vn257hdy40vpcggms5p2"; + url = mirror://xorg/X11R7.6/src/everything/xf86-input-void-1.3.1.tar.bz2; + sha256 = "0x662i756p0nqmfv76ppm28ir2sbvcm32r71ycd9bxc3mj29g9mb"; }; buildInputs = [pkgconfig xorgserver xproto ]; })) // {inherit xorgserver xproto ;}; @@ -1412,51 +1398,51 @@ let })) // {inherit ;}; xf86videoapm = (stdenv.mkDerivation ((if overrides ? xf86videoapm then overrides.xf86videoapm else x: x) { - name = "xf86-video-apm-1.2.2"; + name = "xf86-video-apm-1.2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-apm-1.2.2.tar.bz2; - sha256 = "0lhp3karp7v59p4i7lxk8yc5amsqihwa5pfcf9zpqphx7q3dv3k7"; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-apm-1.2.3.tar.bz2; + sha256 = "1nih9ayiw13aa1s8j6gr99b207215if055c6yvsrssnpvccflij0"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoark = (stdenv.mkDerivation ((if overrides ? xf86videoark then overrides.xf86videoark else x: x) { - name = "xf86-video-ark-0.7.2"; + name = "xf86-video-ark-0.7.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-ark-0.7.2.tar.bz2; - sha256 = "0hap0q41bxq10a2jxbkpb93ad7zxbl1l64bcy4vjhf5xbvhz67nv"; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-ark-0.7.3.tar.bz2; + sha256 = "164gyaaddjjma0xqys0knid2rsd0c7jlab02c8wh3bk4bib9l51r"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; xf86videoast = (stdenv.mkDerivation ((if overrides ? xf86videoast then overrides.xf86videoast else x: x) { - name = "xf86-video-ast-0.89.9"; + name = "xf86-video-ast-0.91.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-ast-0.89.9.tar.bz2; - sha256 = "00dllv1vs8xg9gbsabixsz846xd9y6ijibpl2ljhafip5b9ic3w8"; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-ast-0.91.10.tar.bz2; + sha256 = "05fcp0svdd4skkfgag1rrram6v3xzgasf582dihpyrwlz28186vy"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoati = (stdenv.mkDerivation ((if overrides ? xf86videoati then overrides.xf86videoati else x: x) { - name = "xf86-video-ati-6.12.4"; + name = "xf86-video-ati-6.14.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-ati-6.12.4.tar.bz2; - sha256 = "1xiqyf5pa8k0mva3ikq2i1xq8yn9lswmrsbr9xi9p8c7f1m0dpng"; + url = mirror://xorg/individual/driver/xf86-video-ati-6.14.0.tar.bz2; + sha256 = "12q2b6wj53h23iy9bkm6x8zidan3xqfszhkzyr4qm043x21szjlx"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ]; - })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + })) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videochips = (stdenv.mkDerivation ((if overrides ? xf86videochips then overrides.xf86videochips else x: x) { - name = "xf86-video-chips-1.2.2"; + name = "xf86-video-chips-1.2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-chips-1.2.2.tar.bz2; - sha256 = "03kz0gvg0ryynj4pllbismb77aq2wmsy7zpk4cxynby6zwnfyvzz"; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-chips-1.2.3.tar.bz2; + sha256 = "07fb03cxdlis2rjphz2pl59cjhldrhqric8p0gi4wkgq0s72fq85"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1465,68 +1451,68 @@ let name = "xf86-video-cirrus-1.3.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-cirrus-1.3.2.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-cirrus-1.3.2.tar.bz2; sha256 = "06na525xy5d6xf5g13bjsk9cyxly5arzgrk9j8dmxfll5jj9i6jj"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videodummy = (stdenv.mkDerivation ((if overrides ? xf86videodummy then overrides.xf86videodummy else x: x) { - name = "xf86-video-dummy-0.3.2"; + name = "xf86-video-dummy-0.3.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-dummy-0.3.2.tar.bz2; - sha256 = "1yj5bk79lxdqrdivznqxpds7dh2fdx3d9anz1y990pqb3g1cp2ck"; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-dummy-0.3.4.tar.bz2; + sha256 = "1p0vhxvx25d8fp59i72664smhd0z5zw0i2kipk0879xk1vsxz13y"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; })) // {inherit fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;}; xf86videofbdev = (stdenv.mkDerivation ((if overrides ? xf86videofbdev then overrides.xf86videofbdev else x: x) { - name = "xf86-video-fbdev-0.4.1"; + name = "xf86-video-fbdev-0.4.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-fbdev-0.4.1.tar.bz2; - sha256 = "13r8nwl8z0kwqvgmiaj9wrjwid4d55cs1vn6qsf3lhr3jlbmgy1b"; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-fbdev-0.4.2.tar.bz2; + sha256 = "1mc23w0bfmak5216411xh58nrs93jlxmi6l412hmqzhxnjs73clk"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;}; xf86videogeode = (stdenv.mkDerivation ((if overrides ? xf86videogeode then overrides.xf86videogeode else x: x) { - name = "xf86-video-geode-2.11.6"; + name = "xf86-video-geode-2.11.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-geode-2.11.6.tar.bz2; - sha256 = "148zfkxzw3g56wbhfix4ggw781szbay3rrrjgyji7nq8pi3xl6ja"; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-geode-2.11.10.tar.bz2; + sha256 = "1zdb3y5df1dcqlvijg8hxcd6520a5c69jk52yz7ww194ka2c8icf"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; - })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoglide = (stdenv.mkDerivation ((if overrides ? xf86videoglide then overrides.xf86videoglide else x: x) { - name = "xf86-video-glide-1.0.3"; + name = "xf86-video-glide-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-glide-1.0.3.tar.bz2; - sha256 = "1n76g133iq5pd8pll9k37j2szp8py2qmzr6w0r5jhd13lrazi1gi"; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-glide-1.1.0.tar.bz2; + sha256 = "1wf35ai8z3qqk2a97rp72jzvm28ylw2wj2hllrsn29p7jpznh5aw"; }; - buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ]; - })) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;}; + buildInputs = [pkgconfig xextproto xorgserver xproto ]; + })) // {inherit xextproto xorgserver xproto ;}; xf86videoglint = (stdenv.mkDerivation ((if overrides ? xf86videoglint then overrides.xf86videoglint else x: x) { - name = "xf86-video-glint-1.2.4"; + name = "xf86-video-glint-1.2.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-glint-1.2.4.tar.bz2; - sha256 = "0vypk7njd6927imi80akfyd6q2wl1d8ragg6p8sx4qf208xnx3az"; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-glint-1.2.5.tar.bz2; + sha256 = "0jw1kkyja8hvvhrr3ldl1r5vpqfhn1xmqkpgd2jrkc5p59rz4xan"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xorgserver xproto ;}; xf86videoi128 = (stdenv.mkDerivation ((if overrides ? xf86videoi128 then overrides.xf86videoi128 else x: x) { - name = "xf86-video-i128-1.3.3"; + name = "xf86-video-i128-1.3.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-i128-1.3.3.tar.bz2; - sha256 = "0bmh6adk0pkzkcn0p4xkfi8r2hmya1rp2d6c0mfhfm1viv7921jd"; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-i128-1.3.4.tar.bz2; + sha256 = "1kwb4ifxwm77s1ks19csmq2ymgs36bxqwvwv24ssvxb9znki76xn"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1535,48 +1521,48 @@ let name = "xf86-video-i740-1.3.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-i740-1.3.2.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-i740-1.3.2.tar.bz2; sha256 = "0hzr5fz6d5jk9jxh9plfgvgias3w7xzyg1n4gx0hs2lc7mm9qm28"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) { - name = "xf86-video-intel-2.13.0"; + name = "xf86-video-intel-2.14.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-intel-2.13.0.tar.bz2; - sha256 = "11y85xsm21zaadn7di8vkglbi5d9ibgghzfbjhlkgbn4s3lgmcnq"; + url = mirror://xorg/individual/driver/xf86-video-intel-2.14.0.tar.bz2; + sha256 = "1pq7nm6whc2nmrizf774q042580cfms6yp6yd5p52q59g6jkg371"; }; - buildInputs = [pkgconfig dri2proto fontsproto libdrm libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ]; - })) // {inherit dri2proto fontsproto libdrm libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ;}; + buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ]; + })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ;}; xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then overrides.xf86videomach64 else x: x) { name = "xf86-video-mach64-6.8.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-mach64-6.8.2.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-mach64-6.8.2.tar.bz2; sha256 = "07b7dkb6xc10pvf483dg52r2klpikmw339i5ln9ig913601r84dr"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;}; xf86videomga = (stdenv.mkDerivation ((if overrides ? xf86videomga then overrides.xf86videomga else x: x) { - name = "xf86-video-mga-1.4.11"; + name = "xf86-video-mga-1.4.13"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-mga-1.4.11.tar.bz2; - sha256 = "1rlp1ywvcfk04p7h5n0s2pm7r4d7jkzr5nnv3pa78vs8dwqj46f9"; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-mga-1.4.13.tar.bz2; + sha256 = "1xnzxmp9cfpi6q7fx2r74iwyb33wkdrqcf38dhwydbaaxigvsmxn"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videoneomagic = (stdenv.mkDerivation ((if overrides ? xf86videoneomagic then overrides.xf86videoneomagic else x: x) { - name = "xf86-video-neomagic-1.2.4"; + name = "xf86-video-neomagic-1.2.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-neomagic-1.2.4.tar.bz2; - sha256 = "0lw3i7dkrg98dzjdci6yf4dn3a9j2rmd31hab7s46wh0dnca4ka3"; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-neomagic-1.2.5.tar.bz2; + sha256 = "0jshn5k1byq0msl1ymip3m2xycrd8jkk6nzm5dx2av5xlj1rxdn0"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; @@ -1585,18 +1571,18 @@ let name = "xf86-video-newport-0.2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-newport-0.2.3.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-newport-0.2.3.tar.bz2; sha256 = "0w02rz49gipnfl33vak3zgis8bh9i0v5ykyj8qh9vzddjm7ypjp6"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xorgserver xproto ]; })) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;}; xf86videonv = (stdenv.mkDerivation ((if overrides ? xf86videonv then overrides.xf86videonv else x: x) { - name = "xf86-video-nv-2.1.15"; + name = "xf86-video-nv-2.1.18"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-nv-2.1.15.tar.bz2; - sha256 = "0h9nbbp4dd4lcm9bjmfgv9p9pdq6hj535mnjf70xkkip0i0y1361"; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-nv-2.1.18.tar.bz2; + sha256 = "05glbi9jc7j9nm4sf4qvl3z87s48ibm3i283lqz85kbphg62dxvc"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1605,7 +1591,7 @@ let name = "xf86-video-openchrome-0.2.904"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-openchrome-0.2.904.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-openchrome-0.2.904.tar.bz2; sha256 = "1sksddn0pc3izvab5ppxhprs1xzk5ijwqz5ylivx1cb5hg2gggf7"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ]; @@ -1615,18 +1601,18 @@ let name = "xf86-video-r128-6.8.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-r128-6.8.1.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-r128-6.8.1.tar.bz2; sha256 = "1jlybabm3k09hhlzx1xilndqngk3xgdck66n94sr02w5hg622zji"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;}; xf86videorendition = (stdenv.mkDerivation ((if overrides ? xf86videorendition then overrides.xf86videorendition else x: x) { - name = "xf86-video-rendition-4.2.3"; + name = "xf86-video-rendition-4.2.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-rendition-4.2.3.tar.bz2; - sha256 = "152dfsjf75xbkl8a2xlpr1pl5365b3svhfj9y9dfxzi963ymjmcx"; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-rendition-4.2.4.tar.bz2; + sha256 = "1a9anxgqs7wc8d7jb5nw6dgmynw0sxiwp9p90h4w19y315kqx6rv"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; @@ -1635,7 +1621,7 @@ let name = "xf86-video-s3-0.6.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-s3-0.6.3.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-s3-0.6.3.tar.bz2; sha256 = "0i2i1080cw3pxy1pm43bskb80n7wql0cxpyd2s61v0didsm6b7zd"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; @@ -1645,7 +1631,7 @@ let name = "xf86-video-s3virge-1.10.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-s3virge-1.10.4.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-s3virge-1.10.4.tar.bz2; sha256 = "1f3zjs6a3j2a8lfdilijggpwbg9cs88qksrvzvd71ggxf5p0vl0w"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; @@ -1655,38 +1641,38 @@ let name = "xf86-video-savage-2.3.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-savage-2.3.1.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-savage-2.3.1.tar.bz2; sha256 = "1ays1l4phyjcdikc9d1zwgswivcrb1grkh7klv5klvqahbfxqjib"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videosiliconmotion = (stdenv.mkDerivation ((if overrides ? xf86videosiliconmotion then overrides.xf86videosiliconmotion else x: x) { - name = "xf86-video-siliconmotion-1.7.3"; + name = "xf86-video-siliconmotion-1.7.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-siliconmotion-1.7.3.tar.bz2; - sha256 = "0aqb0sl2ds6n3wqq452xn6d5zkavryiks154xa6c1596wj5ldnpb"; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-siliconmotion-1.7.4.tar.bz2; + sha256 = "1mq4dsg2f77wxl0n4fnm6a5p3lajyhra6rxx29z52p5b1x412xdl"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videosis = (stdenv.mkDerivation ((if overrides ? xf86videosis then overrides.xf86videosis else x: x) { - name = "xf86-video-sis-0.10.2"; + name = "xf86-video-sis-0.10.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-sis-0.10.2.tar.bz2; - sha256 = "1hi8h7ixfbwhnqiara9xx5y6pzi3svnvma97j2dncmg3k4bp1b9s"; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-sis-0.10.3.tar.bz2; + sha256 = "0dy7a7iil35nz1xlazrcq0sp474p6wy0f1pa5y0spbfj5zib6fcv"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ;}; xf86videosisusb = (stdenv.mkDerivation ((if overrides ? xf86videosisusb then overrides.xf86videosisusb else x: x) { - name = "xf86-video-sisusb-0.9.3"; + name = "xf86-video-sisusb-0.9.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-sisusb-0.9.3.tar.bz2; - sha256 = "1clvnjkjzs2fmjm58fv31x6b5nk6y5ahb5vwvrizpm9irh7aky8x"; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-sisusb-0.9.4.tar.bz2; + sha256 = "0b5afc1dqj8h34fldl35hzf7wphj1x76czkd461bfarnvyljgfrb"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ]; })) // {inherit fontsproto randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ;}; @@ -1695,7 +1681,7 @@ let name = "xf86-video-suncg14-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-suncg14-1.1.1.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-suncg14-1.1.1.tar.bz2; sha256 = "1n108xbwg803v2sk51galx66ph8wdb0ym84fx45h0jrr41wh0hyb"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; @@ -1705,7 +1691,7 @@ let name = "xf86-video-suncg3-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-suncg3-1.1.1.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-suncg3-1.1.1.tar.bz2; sha256 = "06c4hzmd5cfzbw79yrv3knss80hllciamz734ij1pbzj6j6fjvym"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; @@ -1715,7 +1701,7 @@ let name = "xf86-video-suncg6-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-suncg6-1.1.1.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-suncg6-1.1.1.tar.bz2; sha256 = "07w0hm63fiy5l3cpcjsl0ig8z84z9r36xm0cmnpiv3g75dy6q8fi"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; @@ -1725,7 +1711,7 @@ let name = "xf86-video-sunffb-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-sunffb-1.2.1.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-sunffb-1.2.1.tar.bz2; sha256 = "04byax4sc1fn183vyyq0q11q730k16h2by4ggjky7s36wgv7ldzx"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ]; @@ -1735,7 +1721,7 @@ let name = "xf86-video-sunleo-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-sunleo-1.2.0.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-sunleo-1.2.0.tar.bz2; sha256 = "01kffjbshmwix2cdb95j0cx2qmrss6yfjj7y5qssw83h36bvw5dk"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; @@ -1745,7 +1731,7 @@ let name = "xf86-video-suntcx-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-suntcx-1.1.1.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-suntcx-1.1.1.tar.bz2; sha256 = "07lqah5sizhwjpzr4vcpwgvbl86fwz4k0c3skp63sq58ng21acal"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; @@ -1755,7 +1741,7 @@ let name = "xf86-video-tdfx-1.4.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-tdfx-1.4.3.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-tdfx-1.4.3.tar.bz2; sha256 = "0cxz1rsc87cnf0ba1zfwhk0lhfas92ysc9b13q6x21m31b53bn9s"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; @@ -1765,28 +1751,28 @@ let name = "xf86-video-tga-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-tga-1.2.1.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-tga-1.2.1.tar.bz2; sha256 = "0mdqrn02zzkdnmhg4vh9djaawg6b2p82g5qbj66z8b30yr77b93h"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; xf86videotrident = (stdenv.mkDerivation ((if overrides ? xf86videotrident then overrides.xf86videotrident else x: x) { - name = "xf86-video-trident-1.3.3"; + name = "xf86-video-trident-1.3.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-trident-1.3.3.tar.bz2; - sha256 = "1x8ibnkq6vv9ify1alc65hj5c8np7bii9dp61cw7b87hyfvflhb2"; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-trident-1.3.4.tar.bz2; + sha256 = "1a4wybqwd617mg8lzn1xvi5m0iibimxpvyqsr31mhb7gw0qidrjq"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; xf86videotseng = (stdenv.mkDerivation ((if overrides ? xf86videotseng then overrides.xf86videotseng else x: x) { - name = "xf86-video-tseng-1.2.3"; + name = "xf86-video-tseng-1.2.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-tseng-1.2.3.tar.bz2; - sha256 = "11via1r9b3x0cfa0ys44w9hff9s5a2wf50hgi1zfhjysg4zbnmh5"; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-tseng-1.2.4.tar.bz2; + sha256 = "0gfiwx2p51k3k78qic8y9y0d3d6nhhbmzfvzmw5hx3ba9kxmvpfh"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1795,7 +1781,7 @@ let name = "xf86-video-v4l-0.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-v4l-0.2.0.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-v4l-0.2.0.tar.bz2; sha256 = "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb"; }; buildInputs = [pkgconfig randrproto videoproto xorgserver xproto ]; @@ -1805,28 +1791,28 @@ let name = "xf86-video-vesa-2.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-vesa-2.3.0.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-vesa-2.3.0.tar.bz2; sha256 = "0yhdj39d8rfv2n4i52dg7cg1rsrclagn7rjs3pc3jdajjh75mn4f"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; xf86videovmware = (stdenv.mkDerivation ((if overrides ? xf86videovmware then overrides.xf86videovmware else x: x) { - name = "xf86-video-vmware-11.0.2"; + name = "xf86-video-vmware-11.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-vmware-11.0.2.tar.bz2; - sha256 = "1lkmyichry4kz4mhj35ry482rflz622gq8j788iq8j5rcjjrvcga"; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-vmware-11.0.3.tar.bz2; + sha256 = "18rqkzr1dvzgdr2khlhhpai69z28rnrfl8jiw9hnahbyv2r7qjmj"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ]; - })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; + })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;}; xf86videovoodoo = (stdenv.mkDerivation ((if overrides ? xf86videovoodoo then overrides.xf86videovoodoo else x: x) { - name = "xf86-video-voodoo-1.2.3"; + name = "xf86-video-voodoo-1.2.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-voodoo-1.2.3.tar.bz2; - sha256 = "1s99ms9kjb1ypq8ra340iyc14x3mkh4vpbbz85r5nchrmfclsp82"; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-voodoo-1.2.4.tar.bz2; + sha256 = "0ha748yz92yzn6hp2rhin3il8f4j2rs4vkgdvqkagnv1ryxkh0ph"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;}; @@ -1835,138 +1821,138 @@ let name = "xf86-video-wsfb-0.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-wsfb-0.3.0.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-wsfb-0.3.0.tar.bz2; sha256 = "17lqhir0adcccfkrzz2sr8cpv5vkakk0w7xfc22vv7c6jz9vdgbq"; }; buildInputs = [pkgconfig xorgserver xproto ]; })) // {inherit xorgserver xproto ;}; xf86videoxgi = (stdenv.mkDerivation ((if overrides ? xf86videoxgi then overrides.xf86videoxgi else x: x) { - name = "xf86-video-xgi-1.5.1"; + name = "xf86-video-xgi-1.6.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-xgi-1.5.1.tar.bz2; - sha256 = "064yginmdlcrk09rmwgbjn1jvgm38j9prfhmzv25yd4xgwlga6fb"; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-xgi-1.6.0.tar.bz2; + sha256 = "05wl9a51pik5swkzpyhh4y2gf6m3hd458r4142p5w39bbkmhcd78"; }; buildInputs = [pkgconfig fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ]; })) // {inherit fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ;}; xf86videoxgixp = (stdenv.mkDerivation ((if overrides ? xf86videoxgixp then overrides.xf86videoxgixp else x: x) { - name = "xf86-video-xgixp-1.7.99.4"; + name = "xf86-video-xgixp-1.8.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-video-xgixp-1.7.99.4.tar.bz2; - sha256 = "15bk90pr8xcwiva1bhfmqz3qjyycwnid4x7iwrwxc47zi661f2pf"; + url = mirror://xorg/X11R7.6/src/everything/xf86-video-xgixp-1.8.0.tar.bz2; + sha256 = "06np5s3f3451vmjwpxbn8hb7d4dhsxff2af8qy8jlc24rinnv9is"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86vidmodeproto = (stdenv.mkDerivation ((if overrides ? xf86vidmodeproto then overrides.xf86vidmodeproto else x: x) { - name = "xf86vidmodeproto-2.3"; + name = "xf86vidmodeproto-2.3.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86vidmodeproto-2.3.tar.bz2; - sha256 = "0iy25ayr105x5b6yfi1a2xvmgc7jaghghp6hjk2k2ys0ll9lcw4g"; + url = mirror://xorg/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2; + sha256 = "0w47d7gfa8zizh2bshdr2rffvbr4jqjv019mdgyh6cmplyd4kna5"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; xfs = (stdenv.mkDerivation ((if overrides ? xfs then overrides.xfs else x: x) { - name = "xfs-1.1.0"; + name = "xfs-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xfs-1.1.0.tar.bz2; - sha256 = "0vazp4p2c9xayd1gdmlqqhklsv0770sgwvmafgjsi204rnxx9fj7"; + url = mirror://xorg/individual/app/xfs-1.1.1.tar.bz2; + sha256 = "1yxm87az3xghngcsd50zz6mdgi9j6vm8pw90sjqzshwq7hx7d0qc"; }; buildInputs = [pkgconfig libFS libXfont xtrans ]; })) // {inherit libFS libXfont xtrans ;}; xgamma = (stdenv.mkDerivation ((if overrides ? xgamma then overrides.xgamma else x: x) { - name = "xgamma-1.0.3"; + name = "xgamma-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xgamma-1.0.3.tar.bz2; - sha256 = "06kf7r0fq1gn2sw6rb0mxlpc5ac78hh09cviapdw5idxzf42bsz5"; + url = mirror://xorg/X11R7.6/src/everything/xgamma-1.0.4.tar.bz2; + sha256 = "05lfx9517why64b3n14drid7vn1d2g2ymg22034vqq50h9437j3x"; }; buildInputs = [pkgconfig libX11 libXxf86vm ]; })) // {inherit libX11 libXxf86vm ;}; xhost = (stdenv.mkDerivation ((if overrides ? xhost then overrides.xhost else x: x) { - name = "xhost-1.0.3"; + name = "xhost-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xhost-1.0.3.tar.bz2; - sha256 = "05xd6j8l120kcz4vz9pdrv1wnfhkq2rlagizliry57z8cmy00qrd"; + url = mirror://xorg/X11R7.6/src/everything/xhost-1.0.4.tar.bz2; + sha256 = "15558q9hgmw6vbwc2sgjkfpzw342lxci9w8vcbrmi8mpmrnc00jy"; }; buildInputs = [pkgconfig libX11 libXau libXmu ]; })) // {inherit libX11 libXau libXmu ;}; xineramaproto = (stdenv.mkDerivation ((if overrides ? xineramaproto then overrides.xineramaproto else x: x) { - name = "xineramaproto-1.2"; + name = "xineramaproto-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xineramaproto-1.2.tar.bz2; - sha256 = "0r5slwkj8h8v548ysgwhm6idqnij8w96nkgr33ch2wpcrs3q1s2q"; + url = mirror://xorg/individual/proto/xineramaproto-1.2.1.tar.bz2; + sha256 = "0ns8abd27x7gbp4r44z3wc5k9zqxxj8zjnazqpcyr4n17nxp8xcp"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; xinit = (stdenv.mkDerivation ((if overrides ? xinit then overrides.xinit else x: x) { - name = "xinit-1.2.1"; + name = "xinit-1.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xinit-1.2.1.tar.bz2; - sha256 = "01wvdi69v9yadzavch6l8c80v1rqgxsyl6cl3byq0v8vx0xcgg0n"; + url = mirror://xorg/individual/app/xinit-1.3.0.tar.bz2; + sha256 = "0k70bw6x2zgvmd0l7xyzbps18pbzfz26yzjva1vcz9s239pf6xms"; }; buildInputs = [pkgconfig libX11 ]; })) // {inherit libX11 ;}; xinput = (stdenv.mkDerivation ((if overrides ? xinput then overrides.xinput else x: x) { - name = "xinput-1.5.2"; + name = "xinput-1.5.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xinput-1.5.2.tar.bz2; - sha256 = "1433lw6xv59f240rgrpgyf9qrmh9knpx64gg95bm32cjvh0qdrrc"; + url = mirror://xorg/X11R7.6/src/everything/xinput-1.5.3.tar.bz2; + sha256 = "0xjwi1sjmvmmzgcvzvz4q8wn0gs7x3aivknx77yfxnndrqqy3bba"; }; buildInputs = [pkgconfig inputproto libX11 libXext libXi ]; })) // {inherit inputproto libX11 libXext libXi ;}; xkbcomp = (stdenv.mkDerivation ((if overrides ? xkbcomp then overrides.xkbcomp else x: x) { - name = "xkbcomp-1.1.1"; + name = "xkbcomp-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xkbcomp-1.1.1.tar.bz2; - sha256 = "0qz6hbypcv350cqrnlks7ncby6gl6g4v5rb550ga9zyr8gyvqxcp"; + url = mirror://xorg/individual/app/xkbcomp-1.2.1.tar.bz2; + sha256 = "1sv51rliqs6wygrp2hc79a5pgn6ly0bbr4sa8a8x00j4j4kjaqdp"; }; buildInputs = [pkgconfig libX11 libxkbfile ]; })) // {inherit libX11 libxkbfile ;}; xkbevd = (stdenv.mkDerivation ((if overrides ? xkbevd then overrides.xkbevd else x: x) { - name = "xkbevd-1.1.0"; + name = "xkbevd-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xkbevd-1.1.0.tar.bz2; - sha256 = "1px26hmn4rv1m997r7bg01w2viaybxgsm4ddahwz27rj43fpl0s6"; + url = mirror://xorg/X11R7.6/src/everything/xkbevd-1.1.2.tar.bz2; + sha256 = "0qzbh1wb2fg0wsyfqr4j15443caa1xfcxwdf1gzb4gpbkxn98qnd"; }; buildInputs = [pkgconfig libX11 libxkbfile ]; })) // {inherit libX11 libxkbfile ;}; xkbutils = (stdenv.mkDerivation ((if overrides ? xkbutils then overrides.xkbutils else x: x) { - name = "xkbutils-1.0.2"; + name = "xkbutils-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xkbutils-1.0.2.tar.bz2; - sha256 = "1vhbqyqgvdzkqlkvj80sg6w4phk8f21g6n8n5djb5pm4ji2pv8qj"; + url = mirror://xorg/X11R7.6/src/everything/xkbutils-1.0.3.tar.bz2; + sha256 = "1ga913pw6chssf2016kjyjl6ar2lj83pa497w97ak2kq603sy2g4"; }; - buildInputs = [pkgconfig inputproto libX11 libXaw libxkbfile ]; - })) // {inherit inputproto libX11 libXaw libxkbfile ;}; + buildInputs = [pkgconfig inputproto libX11 libXaw xproto libXt ]; + })) // {inherit inputproto libX11 libXaw xproto libXt ;}; xkill = (stdenv.mkDerivation ((if overrides ? xkill then overrides.xkill else x: x) { - name = "xkill-1.0.2"; + name = "xkill-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xkill-1.0.2.tar.bz2; - sha256 = "09sskbg2njl52kq7x8l95m7sfg195b06f0wdp8fankizilwz0bak"; + url = mirror://xorg/X11R7.6/src/everything/xkill-1.0.3.tar.bz2; + sha256 = "1ac110qbb9a4x1dim3vaghvdk3jc708i2p3f4rmag33458khg0xx"; }; buildInputs = [pkgconfig libX11 libXmu ]; })) // {inherit libX11 libXmu ;}; @@ -1975,18 +1961,18 @@ let name = "xlsatoms-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xlsatoms-1.1.0.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/xlsatoms-1.1.0.tar.bz2; sha256 = "03fbknvq7rixfgpv5945s7r82jz2xc06a0n09w1p22hl4pd7l0aa"; }; buildInputs = [pkgconfig libxcb ]; })) // {inherit libxcb ;}; xlsclients = (stdenv.mkDerivation ((if overrides ? xlsclients then overrides.xlsclients else x: x) { - name = "xlsclients-1.1.0"; + name = "xlsclients-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xlsclients-1.1.0.tar.bz2; - sha256 = "037sph4zyar6061445xmf1bqrmm00k6qr9lpypjnrx4ragsm2nzr"; + url = mirror://xorg/X11R7.6/src/everything/xlsclients-1.1.1.tar.bz2; + sha256 = "0ng81cm40881gddzwrfdbsvbnqfpqllxaxdsa8m2ljqxlq9mwfs5"; }; buildInputs = [pkgconfig libxcb xcbutil ]; })) // {inherit libxcb xcbutil ;}; @@ -2002,51 +1988,51 @@ let })) // {inherit libXaw libXt ;}; xmodmap = (stdenv.mkDerivation ((if overrides ? xmodmap then overrides.xmodmap else x: x) { - name = "xmodmap-1.0.4"; + name = "xmodmap-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xmodmap-1.0.4.tar.bz2; - sha256 = "1v8bpp3svyza9nn3f8jlilf01nwwzchr3a0sl5h9vxcrbm966nl0"; + url = mirror://xorg/X11R7.6/src/everything/xmodmap-1.0.5.tar.bz2; + sha256 = "00il5y6q2m90f62cqzgc0ni5qg3y946gf98jj325kx8cgfhyf7j2"; }; buildInputs = [pkgconfig libX11 ]; })) // {inherit libX11 ;}; xorgcffiles = (stdenv.mkDerivation ((if overrides ? xorgcffiles then overrides.xorgcffiles else x: x) { - name = "xorg-cf-files-1.0.3"; + name = "xorg-cf-files-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/xorg-cf-files-1.0.3.tar.bz2; - sha256 = "02z2w72bwa1hvjyp7ilw37qs2zbr7cggabq18jzdpb4dzgcdwcmw"; + url = mirror://xorg/individual/util/xorg-cf-files-1.0.4.tar.bz2; + sha256 = "0s86h66b3w4623m88fg2csp41cnr08qc8i3gkj85k3wpwj1wxs9n"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; xorgdocs = (stdenv.mkDerivation ((if overrides ? xorgdocs then overrides.xorgdocs else x: x) { - name = "xorg-docs-1.5"; + name = "xorg-docs-1.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xorg-docs-1.5.tar.bz2; - sha256 = "1z7afnz0cxla7dz9gj95vwrwzqph7w90kd6d5ah7dbcp5rc67k32"; + url = mirror://xorg/X11R7.6/src/everything/xorg-docs-1.6.tar.bz2; + sha256 = "0clxy41642jx77mmw5j2fnwa88ms1a7z1z8xpzrgs45bhv21pcpn"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) { - name = "xorg-server-1.8.2"; + name = "xorg-server-1.9.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.8.2.tar.bz2; - sha256 = "1qmcmrv26p8645nwdm2q558mpvi75fpn9knkacanzysw5497w5aj"; + url = mirror://xorg/individual/xserver/xorg-server-1.9.4.tar.bz2; + sha256 = "0n14xjw7gaqk4xhx7lhr387wr81yvf3cjw1wn0vjx3x5pdz084dd"; }; - buildInputs = [pkgconfig bigreqsproto damageproto dbus fixesproto fontsproto inputproto kbproto libdrm openssl libpciaccess perl pixman randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libXfont libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ]; - })) // {inherit bigreqsproto damageproto dbus fixesproto fontsproto inputproto kbproto libdrm openssl libpciaccess perl pixman randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libXfont libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ;}; + buildInputs = [pkgconfig bigreqsproto damageproto fixesproto fontsproto inputproto kbproto libdrm openssl libpciaccess perl randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ]; + })) // {inherit bigreqsproto damageproto fixesproto fontsproto inputproto kbproto libdrm openssl libpciaccess perl randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ;}; xorgsgmldoctools = (stdenv.mkDerivation ((if overrides ? xorgsgmldoctools then overrides.xorgsgmldoctools else x: x) { - name = "xorg-sgml-doctools-1.3"; + name = "xorg-sgml-doctools-1.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xorg-sgml-doctools-1.3.tar.bz2; - sha256 = "1cnvfmdnyadh56sj29snz5k94zjbnf9aiad6l8dsdi2dm2gjgh6m"; + url = mirror://xorg/X11R7.6/src/everything/xorg-sgml-doctools-1.6.tar.bz2; + sha256 = "0smfsman09dqqw6h638w44lgp2kng2jwk53sb74i7r53x1v09llq"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; @@ -2055,128 +2041,128 @@ let name = "xpr-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xpr-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.6/src/everything/xpr-1.0.3.tar.bz2; sha256 = "0zckkd45lzbikmdn29r12faby8g5prjkacc1z8aw87pq9sqdcy18"; }; buildInputs = [pkgconfig libX11 libXmu ]; })) // {inherit libX11 libXmu ;}; xprop = (stdenv.mkDerivation ((if overrides ? xprop then overrides.xprop else x: x) { - name = "xprop-1.1.0"; + name = "xprop-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xprop-1.1.0.tar.bz2; - sha256 = "09k2qvfg5fvya8a26082ks3laif5fa9a3zdg7c8mz2bl2n80g3nc"; + url = mirror://xorg/X11R7.6/src/everything/xprop-1.2.0.tar.bz2; + sha256 = "173bpq7x2amr77xy28f9m4nfdwr340wj3jw9hkbbznq35c48ql2k"; }; buildInputs = [pkgconfig libX11 ]; })) // {inherit libX11 ;}; xproto = (stdenv.mkDerivation ((if overrides ? xproto then overrides.xproto else x: x) { - name = "xproto-7.0.17"; + name = "xproto-7.0.20"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/proto/xproto-7.0.17.tar.bz2; - sha256 = "00cxgwaijhz7vp60washz03nvwk42f7sz72xkzfcx01pbgf1yb4v"; + url = mirror://xorg/X11R7.6/src/everything/xproto-7.0.20.tar.bz2; + sha256 = "0alyxrd8wmdvdqm1v3q4x5brv4prj0gxf59pp9h5wycvgpj7zs1z"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; xrandr = (stdenv.mkDerivation ((if overrides ? xrandr then overrides.xrandr else x: x) { - name = "xrandr-1.3.3"; + name = "xrandr-1.3.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xrandr-1.3.3.tar.bz2; - sha256 = "0iiywk10vi56k7bpdlhn4wv0friz8vzz6dbfhy1xrnrvsgkg73wn"; + url = mirror://xorg/X11R7.6/src/everything/xrandr-1.3.4.tar.bz2; + sha256 = "1nsadgvn57b9way7v0s4yk2729rwqj1m5fbilmd38lfcws928jjy"; }; buildInputs = [pkgconfig libX11 libXrandr libXrender ]; })) // {inherit libX11 libXrandr libXrender ;}; xrdb = (stdenv.mkDerivation ((if overrides ? xrdb then overrides.xrdb else x: x) { - name = "xrdb-1.0.6"; + name = "xrdb-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xrdb-1.0.6.tar.bz2; - sha256 = "16gwcvpp93mn65dqg5ijc5yns7mglsnabx2dn4icypv6chvjl1ld"; + url = mirror://xorg/individual/app/xrdb-1.0.8.tar.bz2; + sha256 = "1r2k50qnflj40iandhxhvnrvnhy4qliz5kymlh682455gjmlgn7z"; }; buildInputs = [pkgconfig libX11 libXmu ]; })) // {inherit libX11 libXmu ;}; xrefresh = (stdenv.mkDerivation ((if overrides ? xrefresh then overrides.xrefresh else x: x) { - name = "xrefresh-1.0.3"; + name = "xrefresh-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xrefresh-1.0.3.tar.bz2; - sha256 = "1nbyglx05jjz1yjj50x5w449z9f90rw8xzzwrbxvyjximvvsbq1y"; + url = mirror://xorg/X11R7.6/src/everything/xrefresh-1.0.4.tar.bz2; + sha256 = "0ywxzwa4kmnnmf8idr8ssgcil9xvbhnk155zpsh2i8ay93mh5586"; }; buildInputs = [pkgconfig libX11 ]; })) // {inherit libX11 ;}; xset = (stdenv.mkDerivation ((if overrides ? xset then overrides.xset else x: x) { - name = "xset-1.1.0"; + name = "xset-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xset-1.1.0.tar.bz2; - sha256 = "0hs6amxfjbqp2y6bxxihmfnhxral6isb5l18z1fa54080g35kj3j"; + url = mirror://xorg/X11R7.6/src/everything/xset-1.2.1.tar.bz2; + sha256 = "18cja8b9xrilpshz0z8bkmpjm6pjb20w71xf41jgm70h4dymz6gc"; }; - buildInputs = [pkgconfig libX11 libXext libXmu libXp libXxf86misc ]; - })) // {inherit libX11 libXext libXmu libXp libXxf86misc ;}; + buildInputs = [pkgconfig libX11 libXext libXmu libXxf86misc ]; + })) // {inherit libX11 libXext libXmu libXxf86misc ;}; xsetroot = (stdenv.mkDerivation ((if overrides ? xsetroot then overrides.xsetroot else x: x) { - name = "xsetroot-1.0.3"; + name = "xsetroot-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xsetroot-1.0.3.tar.bz2; - sha256 = "0j4gfa6f177hy230fb0gnnj6ibkwbmh9x7rwrmgspqvdd3615rfp"; + url = mirror://xorg/X11R7.6/src/everything/xsetroot-1.1.0.tar.bz2; + sha256 = "1bazzsf9sy0q2bj4lxvh1kvyrhmpggzb7jg575i15sksksa3xwc8"; }; - buildInputs = [pkgconfig libX11 xbitmaps libXmu ]; - })) // {inherit libX11 xbitmaps libXmu ;}; + buildInputs = [pkgconfig libX11 xbitmaps libXcursor libXmu ]; + })) // {inherit libX11 xbitmaps libXcursor libXmu ;}; xtrans = (stdenv.mkDerivation ((if overrides ? xtrans then overrides.xtrans else x: x) { - name = "xtrans-1.2.5"; + name = "xtrans-1.2.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xtrans-1.2.5.tar.bz2; - sha256 = "1688p5v9jalykyj97jv34a6mxfipa7givb7fvbjpd0fsyj8s6wfc"; + url = mirror://xorg/X11R7.6/src/everything/xtrans-1.2.6.tar.bz2; + sha256 = "1im5kj6y8j8m9i5lf1c33dkag6sb7g1zmi0niydqrfyx0lvsgyf5"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; xvinfo = (stdenv.mkDerivation ((if overrides ? xvinfo then overrides.xvinfo else x: x) { - name = "xvinfo-1.1.0"; + name = "xvinfo-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xvinfo-1.1.0.tar.bz2; - sha256 = "1yvfx1lli1k90h8ww0krgd9y3cr0c47nklmr5b6daayrl1n8yc8a"; + url = mirror://xorg/X11R7.6/src/everything/xvinfo-1.1.1.tar.bz2; + sha256 = "119rd93d7661ll1rfcdssn78l0b97326smziyr2f5wdwj2hlmiv0"; }; buildInputs = [pkgconfig libX11 libXv ]; })) // {inherit libX11 libXv ;}; xwd = (stdenv.mkDerivation ((if overrides ? xwd then overrides.xwd else x: x) { - name = "xwd-1.0.3"; + name = "xwd-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xwd-1.0.3.tar.bz2; - sha256 = "1zg3grx6sjm2w1aqyn80k7qvf9p00pp0k4ihsiil8mbc13mdpwpz"; + url = mirror://xorg/X11R7.6/src/everything/xwd-1.0.4.tar.bz2; + sha256 = "07mh72j794hwq5rnqkmdd4wj27mqmdc3da4jkwpva2hsj64wi9mp"; }; buildInputs = [pkgconfig libX11 ]; })) // {inherit libX11 ;}; xwininfo = (stdenv.mkDerivation ((if overrides ? xwininfo then overrides.xwininfo else x: x) { - name = "xwininfo-1.0.5"; + name = "xwininfo-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xwininfo-1.0.5.tar.bz2; - sha256 = "1nfw5jj67g0vnmq5l7622agb3c27jzgl2vbcrsnfgi0bgcdbidld"; + url = mirror://xorg/X11R7.6/src/everything/xwininfo-1.1.1.tar.bz2; + sha256 = "0g9ll8hv0k5cjz4l5kdv64xzmalf9mpwjzcy8nx6myvh92z5fnk4"; }; - buildInputs = [pkgconfig libX11 libXext ]; - })) // {inherit libX11 libXext ;}; + buildInputs = [pkgconfig libX11 libxcb xproto ]; + })) // {inherit libX11 libxcb xproto ;}; xwud = (stdenv.mkDerivation ((if overrides ? xwud then overrides.xwud else x: x) { - name = "xwud-1.0.2"; + name = "xwud-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xwud-1.0.2.tar.bz2; - sha256 = "1h8ap7c29yib6fza2qgbf6pl11km0wjdmairjrl13i0dzzxmsd44"; + url = mirror://xorg/X11R7.6/src/everything/xwud-1.0.3.tar.bz2; + sha256 = "0hrc6gbipg7cximgkaxixlha9m2fph31dpzhzdfw7g63bkhfmzc8"; }; buildInputs = [pkgconfig libX11 ]; })) // {inherit libX11 ;}; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index 405e041545d..6dd80a89978 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -1,5 +1,2 @@ -http://xcb.freedesktop.org/dist/xcb-proto-1.6.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-0.3.6.tar.bz2 -http://xcb.freedesktop.org/dist/libxcb-1.6.tar.bz2 -http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2 -mirror://xorg/individual/lib/pixman-0.18.2.tar.bz2 +mirror://xorg/individual/xcb/xcb-util-0.3.6.tar.bz2 +mirror://xorg/individual/lib/pixman-0.20.2.tar.bz2 diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 2e4ff56294c..444a0637906 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -25,8 +25,10 @@ my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "m $pcMap{$_} = $_ foreach @missingPCs; $pcMap{"freetype2"} = "freetype"; $pcMap{"libpng12"} = "libpng"; +$pcMap{"libpng"} = "libpng"; $pcMap{"dbus-1"} = "dbus"; $pcMap{"uuid"} = "libuuid"; +$pcMap{"libudev"} = "udev"; $pcMap{"gl"} = "mesa"; $pcMap{"\$PIXMAN"} = "pixman"; $pcMap{"\$RENDERPROTO"} = "renderproto"; diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list index b54159cf220..5eacf46d1c3 100644 --- a/pkgs/servers/x11/xorg/old.list +++ b/pkgs/servers/x11/xorg/old.list @@ -1,15 +1,15 @@ -mirror://xorg/individual/app/twm-1.0.4.tar.bz2 -mirror://xorg/individual/app/xclock-1.0.4.tar.bz2 +mirror://xorg/individual/app/twm-1.0.6.tar.bz2 +mirror://xorg/individual/app/xclock-1.0.5.tar.bz2 mirror://xorg/individual/app/xdm-1.1.10.tar.bz2 -mirror://xorg/individual/app/xeyes-1.1.0.tar.bz2 -mirror://xorg/individual/app/xfs-1.1.0.tar.bz2 -mirror://xorg/individual/app/xinit-1.2.1.tar.bz2 +mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2 +mirror://xorg/individual/app/xfs-1.1.1.tar.bz2 +mirror://xorg/individual/app/xinit-1.3.0.tar.bz2 mirror://xorg/individual/app/xmessage-1.0.3.tar.bz2 -mirror://xorg/individual/lib/libXp-1.0.0.tar.bz2 -mirror://xorg/individual/lib/libXxf86misc-1.0.2.tar.bz2 -mirror://xorg/individual/proto/printproto-1.0.4.tar.bz2 +mirror://xorg/individual/lib/libXp-1.0.1.tar.bz2 +mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2 +mirror://xorg/individual/proto/printproto-1.0.5.tar.bz2 mirror://xorg/individual/proto/xf86miscproto-0.9.3.tar.bz2 mirror://xorg/individual/util/gccmakedep-1.0.2.tar.bz2 -mirror://xorg/individual/util/imake-1.0.3.tar.bz2 -mirror://xorg/individual/util/lndir-1.0.1.tar.bz2 -mirror://xorg/individual/util/xorg-cf-files-1.0.3.tar.bz2 +mirror://xorg/individual/util/imake-1.0.4.tar.bz2 +mirror://xorg/individual/util/lndir-1.0.2.tar.bz2 +mirror://xorg/individual/util/xorg-cf-files-1.0.4.tar.bz2 diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 87d4924a363..f1b0f64f02e 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -49,6 +49,11 @@ in libX11 = attrs: attrs // { preConfigure = setMalloc0ReturnsNullCrossCompiling; + postInstall = + '' + # Remove useless DocBook XML files. + rm -rf $out/share/doc + ''; }; libXrender = attrs: attrs // { @@ -63,13 +68,30 @@ in preConfigure = setMalloc0ReturnsNullCrossCompiling; }; + # Propagate some build inputs because of header file dependencies. + # Note: most of these are in Requires.private, so maybe builder.sh + # should propagate them automatically. libXt = attrs: attrs // { preConfigure = setMalloc0ReturnsNullCrossCompiling; + propagatedBuildInputs = [ xorg.libSM ]; }; + compositeproto = attrs: attrs // { + propagatedBuildInputs = [ xorg.fixesproto ]; + }; + + libXcomposite = attrs: attrs // { + propagatedBuildInputs = [ xorg.libXfixes ]; + }; + + libXaw = attrs: attrs // { + propagatedBuildInputs = [ xorg.libXmu ]; + }; + libXft = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [ xorg.xproto xorg.libX11 - xorg.renderproto ]; + buildInputs = attrs.buildInputs ++ + [ xorg.xproto xorg.libX11 xorg.renderproto ]; + propagatedBuildInputs = [ xorg.libXrender ]; preConfigure = setMalloc0ReturnsNullCrossCompiling; }; @@ -91,13 +113,13 @@ in }; xf86inputevdev = attrs: attrs // { - configureFlags = "--with-sdkdir=\${out}/include/xorg"; preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c"; buildInputs = attrs.buildInputs ++ [xorg.kbproto xorg.libxkbfile xorg.randrproto]; + installFlags = "sdkdir=\${out}/include/xorg"; }; xf86inputsynaptics = attrs: attrs // { - makeFlags = "sdkdir=\${out}/include/xorg"; + installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/include/xorg"; }; xf86videointel = attrs: attrs // { @@ -135,15 +157,17 @@ in xorgserver = attrs: attrs // { patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch]; buildInputs = attrs.buildInputs ++ - [ args.zlib args.udev args.mesa + [ args.zlib args.udev args.mesa args.dbus.libs xorg.xf86bigfontproto xorg.glproto xorg.xf86driproto xorg.compositeproto xorg.scrnsaverproto xorg.resourceproto - xorg.xineramaproto xorg.dri2proto xorg.xf86dgaproto + xorg.xineramaproto xorg.xf86dgaproto xorg.dmxproto xorg.libdmx xorg.xf86vidmodeproto - xorg.recordproto xorg.libXext + xorg.recordproto xorg.libXext xorg.pixman xorg.libXfont ]; propagatedBuildInputs = - [ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto ]; + [ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto + xorg.dri2proto xorg.kbproto + ]; postInstall = '' rm -fr $out/share/X11/xkb/compiled diff --git a/pkgs/servers/x11/xorg/tarballs-7.5.list b/pkgs/servers/x11/xorg/tarballs-7.5.list deleted file mode 100644 index 7c0748893ee..00000000000 --- a/pkgs/servers/x11/xorg/tarballs-7.5.list +++ /dev/null @@ -1,197 +0,0 @@ -mirror://xorg/X11R7.5/src/everything/applewmproto-1.4.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/bdftopcf-1.0.2.tar.bz2 -mirror://xorg/X11R7.5/src/everything/bigreqsproto-1.1.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/compositeproto-0.4.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/damageproto-1.2.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/dmxproto-2.3.tar.bz2 -mirror://xorg/individual/proto/dri2proto-2.3.tar.bz2 -mirror://xorg/X11R7.5/src/everything/encodings-1.0.3.tar.bz2 -mirror://xorg/X11R7.5/src/everything/fixesproto-4.1.1.tar.bz2 -mirror://xorg/individual/font/font-adobe-100dpi-1.0.2.tar.bz2 -mirror://xorg/individual/font/font-adobe-75dpi-1.0.2.tar.bz2 -mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.3.tar.bz2 -mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.3.tar.bz2 -mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.3.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-alias-1.0.2.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-arabic-misc-1.0.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-bh-100dpi-1.0.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-bh-75dpi-1.0.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-bh-lucidatypewriter-100dpi-1.0.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-bh-lucidatypewriter-75dpi-1.0.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-bh-ttf-1.0.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-bh-type1-1.0.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-bitstream-100dpi-1.0.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-bitstream-75dpi-1.0.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-bitstream-type1-1.0.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-cronyx-cyrillic-1.0.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-cursor-misc-1.0.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-daewoo-misc-1.0.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-dec-misc-1.0.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-ibm-type1-1.0.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-isas-misc-1.0.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-jis-misc-1.0.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-micro-misc-1.0.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-misc-cyrillic-1.0.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-misc-ethiopic-1.0.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-misc-meltho-1.0.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-misc-misc-1.1.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-mutt-misc-1.0.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-schumacher-misc-1.1.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-screen-cyrillic-1.0.2.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-sony-misc-1.0.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/fontsproto-2.1.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-sun-misc-1.0.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-util-1.1.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-winitzki-cyrillic-1.0.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/font-xfree86-type1-1.0.2.tar.bz2 -mirror://xorg/individual/proto/glproto-1.4.11.tar.bz2 -mirror://xorg/X11R7.5/src/everything/iceauth-1.0.3.tar.bz2 -mirror://xorg/X11R7.5/src/everything/inputproto-2.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/kbproto-1.0.4.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libAppleWM-1.4.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libdmx-1.1.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libfontenc-1.0.5.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libFS-1.0.2.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libICE-1.0.6.tar.bz2 -mirror://xorg/individual/lib/libpciaccess-0.12.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libSM-1.1.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/individual/lib/libX11-1.3.4.tar.bz2 -mirror://xorg/individual/lib/libXau-1.0.6.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libXaw-1.0.7.tar.bz2 -mirror://xorg/individual/lib/libXcomposite-0.4.2.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libXcursor-1.1.10.tar.bz2 -mirror://xorg/individual/lib/libXdamage-1.1.3.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libXdmcp-1.0.3.tar.bz2 -mirror://xorg/individual/lib/libXext-1.1.2.tar.bz2 -mirror://xorg/individual/lib/libXfixes-4.0.5.tar.bz2 -mirror://xorg/individual/lib/libXfont-1.4.2.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libXft-2.1.14.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libXi-1.3.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libXinerama-1.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libxkbfile-1.0.6.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libXmu-1.0.5.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libXpm-3.5.8.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libXrandr-1.3.0.tar.bz2 -mirror://xorg/individual/lib/libXrender-0.9.6.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libXres-1.0.4.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libXScrnSaver-1.2.0.tar.bz2 -mirror://xorg/individual/lib/libXt-1.0.8.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libXtst-1.1.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libXv-1.0.5.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libXvMC-1.0.5.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libXxf86dga-1.1.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libXxf86vm-1.1.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/luit-1.0.4.tar.bz2 -mirror://xorg/X11R7.5/src/everything/makedepend-1.0.2.tar.bz2 -mirror://xorg/X11R7.5/src/everything/mkfontdir-1.0.5.tar.bz2 -mirror://xorg/X11R7.5/src/everything/mkfontscale-1.0.7.tar.bz2 -mirror://xorg/X11R7.5/src/everything/randrproto-1.3.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/recordproto-1.14.tar.bz2 -mirror://xorg/X11R7.5/src/everything/renderproto-0.11.tar.bz2 -mirror://xorg/X11R7.5/src/everything/resourceproto-1.1.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/scrnsaverproto-1.2.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/sessreg-1.0.5.tar.bz2 -mirror://xorg/X11R7.5/src/everything/setxkbmap-1.1.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/smproxy-1.0.3.tar.bz2 -mirror://xorg/individual/util/util-macros-1.10.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/videoproto-2.3.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/windowswmproto-1.0.4.tar.bz2 -mirror://xorg/X11R7.5/src/everything/x11perf-1.5.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xauth-1.0.4.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xbacklight-1.1.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xbitmaps-1.1.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xcmiscproto-1.2.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xcmsdb-1.0.2.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xcursorgen-1.0.3.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xcursor-themes-1.0.2.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xdpyinfo-1.1.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xdriinfo-1.0.3.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xev-1.0.4.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xextproto-7.1.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86bigfontproto-1.2.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86dgaproto-2.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86driproto-2.1.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-input-acecad-1.4.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-input-aiptek-1.3.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-evdev-2.5.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-input-joystick-1.4.99.2.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-input-keyboard-1.4.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-input-mouse-1.5.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-synaptics-1.3.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-vmmouse-12.6.10.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-input-vmmouse-12.6.5.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-input-void-1.3.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-apm-1.2.2.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-ark-0.7.2.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-ast-0.89.9.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-ati-6.12.4.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-chips-1.2.2.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-cirrus-1.3.2.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-dummy-0.3.2.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-fbdev-0.4.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-geode-2.11.6.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-glide-1.0.3.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-glint-1.2.4.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-i128-1.3.3.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-i740-1.3.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-intel-2.13.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-mach64-6.8.2.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-mga-1.4.11.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-neomagic-1.2.4.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-newport-0.2.3.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-nv-2.1.15.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-openchrome-0.2.904.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-r128-6.8.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-rendition-4.2.3.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-s3-0.6.3.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-s3virge-1.10.4.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-savage-2.3.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-siliconmotion-1.7.3.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-sis-0.10.2.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-sisusb-0.9.3.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-suncg14-1.1.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-suncg3-1.1.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-suncg6-1.1.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-sunffb-1.2.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-sunleo-1.2.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-suntcx-1.1.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-tdfx-1.4.3.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-tga-1.2.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-trident-1.3.3.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-tseng-1.2.3.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-v4l-0.2.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-vesa-2.3.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-vmware-11.0.2.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-voodoo-1.2.3.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-wsfb-0.3.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-xgi-1.5.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86-video-xgixp-1.7.99.4.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xf86vidmodeproto-2.3.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xgamma-1.0.3.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xhost-1.0.3.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xineramaproto-1.2.tar.bz2 -mirror://xorg/individual/app/xinput-1.5.2.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xkbcomp-1.1.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xkbevd-1.1.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xkbutils-1.0.2.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xkill-1.0.2.tar.bz2 -mirror://xorg/individual/app/xlsatoms-1.1.0.tar.bz2 -mirror://xorg/individual/app/xlsclients-1.1.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xmodmap-1.0.4.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xorg-docs-1.5.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.8.2.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xorg-sgml-doctools-1.3.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xpr-1.0.3.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xprop-1.1.0.tar.bz2 -mirror://xorg/individual/proto/xproto-7.0.17.tar.bz2 -mirror://xorg/individual/app/xrandr-1.3.3.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xrdb-1.0.6.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xrefresh-1.0.3.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xset-1.1.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xsetroot-1.0.3.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xtrans-1.2.5.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xvinfo-1.1.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xwd-1.0.3.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xwininfo-1.0.5.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xwud-1.0.2.tar.bz2 diff --git a/pkgs/servers/x11/xorg/tarballs-7.6.list b/pkgs/servers/x11/xorg/tarballs-7.6.list new file mode 100644 index 00000000000..6a745887ca4 --- /dev/null +++ b/pkgs/servers/x11/xorg/tarballs-7.6.list @@ -0,0 +1,199 @@ +mirror://xorg/X11R7.6/src/everything/applewmproto-1.4.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/bdftopcf-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/bigreqsproto-1.1.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/compositeproto-0.4.2.tar.bz2 +mirror://xorg/X11R7.6/src/everything/damageproto-1.2.1.tar.bz2 +mirror://xorg/individual/proto/dmxproto-2.3.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/dri2proto-2.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/encodings-1.0.4.tar.bz2 +mirror://xorg/X11R7.6/src/everything/fixesproto-4.1.2.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-adobe-100dpi-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-adobe-75dpi-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-adobe-utopia-type1-1.0.4.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-alias-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-arabic-misc-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-bh-100dpi-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-bh-75dpi-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-bh-ttf-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-bh-type1-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-bitstream-100dpi-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-bitstream-75dpi-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-bitstream-type1-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-cronyx-cyrillic-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-cursor-misc-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-daewoo-misc-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-dec-misc-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-ibm-type1-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-isas-misc-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-jis-misc-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-micro-misc-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-misc-cyrillic-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-misc-ethiopic-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-misc-meltho-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-misc-misc-1.1.2.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-mutt-misc-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-schumacher-misc-1.1.2.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-screen-cyrillic-1.0.4.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-sony-misc-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/fontsproto-2.1.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-sun-misc-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-util-1.2.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/font-xfree86-type1-1.0.4.tar.bz2 +mirror://xorg/X11R7.6/src/everything/glproto-1.4.12.tar.bz2 +mirror://xorg/X11R7.6/src/everything/iceauth-1.0.4.tar.bz2 +mirror://xorg/X11R7.6/src/everything/inputproto-2.0.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/kbproto-1.0.5.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libAppleWM-1.4.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libdmx-1.1.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libfontenc-1.1.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libFS-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libICE-1.0.7.tar.bz2 +mirror://xorg/individual/lib/libpciaccess-0.12.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libpthread-stubs-0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libSM-1.2.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libWindowsWM-1.0.1.tar.bz2 +mirror://xorg/individual/lib/libX11-1.4.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libXau-1.0.6.tar.bz2 +mirror://xorg/individual/lib/libXaw-1.0.9.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libxcb-1.7.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libXcomposite-0.4.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libXcursor-1.1.11.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libXdamage-1.1.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libXdmcp-1.1.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libXext-1.2.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libXfixes-4.0.5.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libXfont-1.4.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libXft-2.2.0.tar.bz2 +mirror://xorg/individual/lib/libXi-1.4.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libXinerama-1.1.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libxkbfile-1.0.7.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libXmu-1.1.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libXpm-3.5.9.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libXrandr-1.3.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libXrender-0.9.6.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libXres-1.0.5.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libXScrnSaver-1.2.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libXt-1.0.9.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libXtst-1.2.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libXv-1.0.6.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libXvMC-1.0.6.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libXxf86dga-1.1.2.tar.bz2 +mirror://xorg/X11R7.6/src/everything/libXxf86vm-1.1.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/luit-1.1.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/makedepend-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/mkfontdir-1.0.6.tar.bz2 +mirror://xorg/X11R7.6/src/everything/mkfontscale-1.0.8.tar.bz2 +mirror://xorg/X11R7.6/src/everything/randrproto-1.3.2.tar.bz2 +mirror://xorg/X11R7.6/src/everything/recordproto-1.14.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/renderproto-0.11.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/resourceproto-1.1.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/scrnsaverproto-1.2.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/sessreg-1.0.6.tar.bz2 +mirror://xorg/X11R7.6/src/everything/setxkbmap-1.2.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/smproxy-1.0.4.tar.bz2 +mirror://xorg/X11R7.6/src/everything/util-macros-1.11.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/videoproto-2.3.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/windowswmproto-1.0.4.tar.bz2 +mirror://xorg/individual/app/x11perf-1.5.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xauth-1.0.5.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xbacklight-1.1.2.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xbitmaps-1.1.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xcb-proto-1.6.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xcmiscproto-1.2.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xcmsdb-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xcursorgen-1.0.4.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xcursor-themes-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xdpyinfo-1.2.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xdriinfo-1.0.4.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xev-1.1.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xextproto-7.1.2.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86bigfontproto-1.2.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86dgaproto-2.1.tar.bz2 +mirror://xorg/individual/proto/xf86driproto-2.1.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-input-acecad-1.4.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-input-aiptek-1.3.1.tar.bz2 +mirror://xorg/individual/driver/xf86-input-evdev-2.6.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-input-joystick-1.5.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-input-keyboard-1.5.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-input-mouse-1.6.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-input-synaptics-1.3.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-input-vmmouse-12.6.10.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-input-void-1.3.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-apm-1.2.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-ark-0.7.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-ast-0.91.10.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-6.14.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-chips-1.2.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-cirrus-1.3.2.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-dummy-0.3.4.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-fbdev-0.4.2.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-geode-2.11.10.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-glide-1.1.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-glint-1.2.5.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-i128-1.3.4.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-i740-1.3.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-intel-2.14.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-mach64-6.8.2.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-mga-1.4.13.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-neomagic-1.2.5.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-newport-0.2.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-nv-2.1.18.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-openchrome-0.2.904.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-r128-6.8.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-rendition-4.2.4.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-s3-0.6.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-s3virge-1.10.4.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-savage-2.3.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-siliconmotion-1.7.4.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-sis-0.10.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-sisusb-0.9.4.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-suncg14-1.1.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-suncg3-1.1.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-suncg6-1.1.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-sunffb-1.2.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-sunleo-1.2.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-suntcx-1.1.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-tdfx-1.4.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-tga-1.2.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-trident-1.3.4.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-tseng-1.2.4.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-v4l-0.2.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-vesa-2.3.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-vmware-11.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-voodoo-1.2.4.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-wsfb-0.3.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-xgi-1.6.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xf86-video-xgixp-1.8.0.tar.bz2 +mirror://xorg/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xgamma-1.0.4.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xhost-1.0.4.tar.bz2 +mirror://xorg/individual/proto/xineramaproto-1.2.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xinput-1.5.3.tar.bz2 +mirror://xorg/individual/app/xkbcomp-1.2.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xkbevd-1.1.2.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xkbutils-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xkill-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xlsatoms-1.1.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xlsclients-1.1.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xmodmap-1.0.5.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xorg-docs-1.6.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.9.4.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xorg-sgml-doctools-1.6.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xpr-1.0.3.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xprop-1.2.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xproto-7.0.20.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xrandr-1.3.4.tar.bz2 +mirror://xorg/individual/app/xrdb-1.0.8.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xrefresh-1.0.4.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xset-1.2.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xsetroot-1.1.0.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xtrans-1.2.6.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xvinfo-1.1.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xwd-1.0.4.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xwininfo-1.1.1.tar.bz2 +mirror://xorg/X11R7.6/src/everything/xwud-1.0.3.tar.bz2 diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 042f5befab0..191514f57f8 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchurl, pkgconfig, x11, libpng, libjpeg, expat, libXaw -, yacc, libtool, fontconfig, pango, gd +{ stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw +, yacc, libtool, fontconfig, pango, gd, xlibs }: -assert libpng != null && libjpeg != null && expat != null; - stdenv.mkDerivation rec { - name = "graphviz-2.22.2"; + name = "graphviz-2.26.3"; src = fetchurl { url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz"; - sha256 = "1yzda1al32la3wyrxwc1hs83sx9p84zh6xlpcpkx90xvjaav827v"; + sha256 = "18bzyg17ni0lpcd2g5dhan8fjv3vzkjym38jq8vm42did5p9j47l"; }; - buildInputs = [pkgconfig x11 libpng libjpeg expat libXaw yacc libtool fontconfig pango gd]; + buildInputs = + [ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig + pango gd + ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ]; configureFlags = [ "--with-pngincludedir=${libpng}/include" @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { "--with-expatincludedir=${expat}/include" "--with-expatlibdir=${expat}/lib" ] - ++ stdenv.lib.optional (x11 == null) "--without-x"; + ++ stdenv.lib.optional (xlibs == null) "--without-x"; meta = { description = "A program for visualising graphs"; diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index 5a9ba7a5753..bf309c3cdbf 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib}: +{ stdenv, fetchurl, pkgconfig, glib }: stdenv.mkDerivation rec { name = "nbd-2.9.20"; @@ -10,6 +10,10 @@ stdenv.mkDerivation rec { buildInputs = [pkgconfig glib]; postInstall = ''install -D -m 444 README "$out/share/doc/nbd/README"''; + + # Glib calls `clock_gettime', which is in librt. Since we're using + # a static Glib, we need to pass it explicitly. + NIX_LDFLAGS = "-lrt"; meta = { homepage = "http://nbd.sourceforge.net"; diff --git a/pkgs/tools/system/gdmap/default.nix b/pkgs/tools/system/gdmap/default.nix index f361e862b63..e9592b36666 100644 --- a/pkgs/tools/system/gdmap/default.nix +++ b/pkgs/tools/system/gdmap/default.nix @@ -1,16 +1,19 @@ { stdenv, fetchurl, gtk, pkgconfig, libxml2, intltool, gettext }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "gdmap-0.8.1"; src = fetchurl { - url = http://downloads.sourceforge.net/gdmap/gdmap-0.8.1.tar.gz; + url = "mirror://sourceforge/gdmap/${name}.tar.gz"; sha256 = "0nr8l88cg19zj585hczj8v73yh21k7j13xivhlzl8jdk0j0cj052"; }; buildInputs = [ gtk pkgconfig libxml2 intltool gettext ]; + patches = [ ./get_sensitive.patch ./set_flags.patch ]; + meta = { + homepage = http://gdmap.sourceforge.net; description = "Recursive rectangle map of disk usage"; }; } diff --git a/pkgs/tools/system/gdmap/get_sensitive.patch b/pkgs/tools/system/gdmap/get_sensitive.patch new file mode 100644 index 00000000000..3cdb6291dfa --- /dev/null +++ b/pkgs/tools/system/gdmap/get_sensitive.patch @@ -0,0 +1,34 @@ +From 166de50914191303b232ec123cfbaadad521560c Mon Sep 17 00:00:00 2001 +From: Alexander Myltsev +Date: Wed, 21 Apr 2010 22:43:14 +0400 +Subject: [PATCH] GTK_WIDGET_SENSITIVE -> gtk_widget_get_sensitive + +--- + gdmap/src/gui_support.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/gui_support.c b/src/gui_support.c +index 3027e29..45272d3 100644 +--- a/src/gui_support.c ++++ b/src/gui_support.c +@@ -85,7 +85,7 @@ on_ebox_enter(GtkWidget* box, GdkEventCrossing* event, GtkLabel* label) { + const char* text; + + (void)event; +- if (GTK_WIDGET_SENSITIVE(label)) { ++ if (gtk_widget_get_sensitive(GTK_WIDGET(label))) { + char* temp; + + text = g_object_get_data(G_OBJECT(label), "label"); +@@ -129,7 +129,7 @@ static void on_clear_label(GtkWidget* widget) { + void ui_event_label_set_sensitive(GtkWidget* ebox, gboolean set) { + gpointer callback = g_object_get_data(G_OBJECT(ebox), "callback"); + GtkWidget* child = GTK_BIN(ebox)->child; +- if (GTK_WIDGET_SENSITIVE(child) == set) return; ++ if (gtk_widget_get_sensitive(child) == set) return; + + if (set && !callback) return; + gtk_widget_set_sensitive(child, set); +-- +1.7.3.3 + diff --git a/pkgs/tools/system/gdmap/set_flags.patch b/pkgs/tools/system/gdmap/set_flags.patch new file mode 100644 index 00000000000..388836f6e5f --- /dev/null +++ b/pkgs/tools/system/gdmap/set_flags.patch @@ -0,0 +1,25 @@ +From 9a5537d2b0aba18438dd77a45354ac2e73eae23d Mon Sep 17 00:00:00 2001 +From: Alexander Myltsev +Date: Mon, 13 Dec 2010 23:24:30 +0300 +Subject: [PATCH] GTK_WIDGET_SET_FLAGS -> gtk_widget_set_can_focus + +--- + gdmap/src/gui_support.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/gui_support.c b/src/gui_support.c +index 45272d3..ca02d72 100644 +--- a/src/gui_support.c ++++ b/src/gui_support.c +@@ -164,7 +164,7 @@ GtkWidget* ui_create_event_label(const char* text, GCallback callback, + // GDK_FOCUS_CHANGE_MASK | + GDK_ENTER_NOTIFY_MASK | + GDK_LEAVE_NOTIFY_MASK); +- GTK_WIDGET_SET_FLAGS(ebox, GTK_CAN_FOCUS); ++ gtk_widget_set_can_focus(ebox, TRUE); + + gtk_widget_show(ebox); + +-- +1.7.3.3 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1d75636f84..4d6c03603c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -394,16 +394,9 @@ let autojump = callPackage ../tools/misc/autojump { }; - avahi = - let qt4Support = getConfig [ "avahi" "qt4Support" ] false; - in - makeOverridable (import ../development/libraries/avahi) { - inherit stdenv fetchurl pkgconfig libdaemon dbus perl perlXMLParser - expat gettext intltool lib; - inherit (gtkLibs) glib gtk; - inherit qt4Support; - qt4 = if qt4Support then qt4 else null; - }; + avahi = callPackage ../development/libraries/avahi { + qt4Support = getConfig [ "avahi" "qt4Support" ] false; + }; axel = callPackage ../tools/networking/axel { }; @@ -661,7 +654,7 @@ let gawk = callPackage ../tools/text/gawk { }; gdmap = callPackage ../tools/system/gdmap { - inherit (gtkLibs216) gtk; + inherit (pkgs.gtkLibs) gtk; }; genext2fs = callPackage ../tools/filesystems/genext2fs { }; @@ -2783,9 +2776,6 @@ let buddy = callPackage ../development/libraries/buddy { }; cairo = callPackage ../development/libraries/cairo { }; - cairo_1_10_0 = callPackage ../development/libraries/cairo/1.10.nix { - pixman = xlibs.pixman_0_20_0; - }; cairomm = callPackage ../development/libraries/cairomm { }; @@ -2869,7 +2859,7 @@ let db45 = callPackage ../development/libraries/db4/db4-4.5.nix { }; dbus = callPackage ../development/libraries/dbus { - useX11 = true; # !!! `false' doesn't build + useX11 = true; }; dbus_glib = makeOverridable (import ../development/libraries/dbus-glib) { @@ -2986,10 +2976,6 @@ let gdbm = callPackage ../development/libraries/gdbm { }; - gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { - inherit (gtkLibs1x) gtk; - }; - gegl = callPackage ../development/libraries/gegl { # avocodec avformat librsvg inherit (gtkLibs) pango glib gtk; @@ -3180,13 +3166,13 @@ let gtkmathview = callPackage ../development/libraries/gtkmathview { }; - gtkLibs = gtkLibs220; + gtkLibs = gtkLibs224; glib = gtkLibs.glib; gtk = gtkLibs.gtk; pango = gtkLibs.pango; - gtkLibs1x = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs1x; in rec { + gtkLibs1x = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs1x; in { glib = callPackage ../development/libraries/glib/1.2.x.nix { }; @@ -3194,7 +3180,7 @@ let }); - gtkLibs216 = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs216; in rec { + gtkLibs216 = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs216; in { glib = callPackage ../development/libraries/glib/2.20.x.nix { }; @@ -3212,25 +3198,7 @@ let }); - gtkLibs218 = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs218; in rec { - - glib = callPackage ../development/libraries/glib/2.22.x.nix { }; - - glibmm = callPackage ../development/libraries/glibmm/2.22.x.nix { }; - - atk = callPackage ../development/libraries/atk/1.28.x.nix { }; - - pango = callPackage ../development/libraries/pango/1.26.x.nix { }; - - pangomm = callPackage ../development/libraries/pangomm/2.26.x.nix { }; - - gtk = callPackage ../development/libraries/gtk+/2.18.x.nix { }; - - gtkmm = callPackage ../development/libraries/gtkmm/2.18.x.nix { }; - - }); - - gtkLibs220 = recurseIntoAttrs (let callPackage = pkgs.newScope pkgs.gtkLibs220; in rec { + gtkLibs220 = recurseIntoAttrs (let callPackage = pkgs.newScope pkgs.gtkLibs220; in { glib = callPackage ../development/libraries/glib/2.24.x.nix { }; @@ -3248,7 +3216,25 @@ let }); - glib_2_28 = callPackage ../development/libraries/glib/2.28.x.nix {}; + gtkLibs224 = recurseIntoAttrs (let callPackage = pkgs.newScope pkgs.gtkLibs224; in { + + glib = callPackage ../development/libraries/glib/2.28.x.nix { }; + + glibmm = callPackage ../development/libraries/glibmm/2.22.x.nix { }; + + atk = callPackage ../development/libraries/atk/1.32.x.nix { }; + + pango = callPackage ../development/libraries/pango/1.28.x.nix { }; + + pangomm = callPackage ../development/libraries/pangomm/2.26.x.nix { }; + + gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.22.x.nix { }; + + gtk = callPackage ../development/libraries/gtk+/2.24.x.nix { }; + + gtkmm = callPackage ../development/libraries/gtkmm/2.18.x.nix { }; + + }); gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp { inherit (gnome) gtk; @@ -3779,10 +3765,6 @@ let mesa = callPackage ../development/libraries/mesa { lipo = if stdenv.isDarwin then darwinLipoUtility else null; }; - mesa_7_9 = callPackage ../development/libraries/mesa/7.9.nix { - lipo = if stdenv.isDarwin then darwinLipoUtility else null; - }; - metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec { sdfLibrary = callPackage ../development/libraries/sdf-library { aterm = aterm28; }; @@ -5158,9 +5140,7 @@ let libraw1394 = callPackage ../development/libraries/libraw1394 { }; - libsexy = callPackage ../development/libraries/libsexy { - inherit (gtkLibs) glib gtk pango; - }; + libsexy = callPackage ../development/libraries/libsexy { }; librsvg = gnome.librsvg; @@ -5828,8 +5808,8 @@ let Xaw3d = null; gtk = if stdenv.isDarwin then null else gtkLibs.gtk; # TODO: these packages don't build on Darwin. - gconf = if stdenv.isDarwin then null else gnome.GConf; - librsvg = if stdenv.isDarwin then null else librsvg; + gconf = null /* if stdenv.isDarwin then null else gnome.GConf */; + librsvg = null /* if stdenv.isDarwin then null else librsvg */; }; emacsSnapshot = lowPrio (callPackage ../applications/editors/emacs-snapshot { @@ -5915,9 +5895,7 @@ let libgnomeui libglade glib gtk scrollkeeper gnome_keyring; }); - evolution_data_server = (newScope (gnome // gtkLibs)) - ../servers/evolution-data-server { - }; + evolution_data_server = newScope (gnome // gtkLibs) ../servers/evolution-data-server { }; exrdisplay = callPackage ../applications/graphics/exrdisplay { fltk = fltk20; @@ -5978,9 +5956,7 @@ let inherit (gnome) libIDL; }; - firefox40Pkgs = let p = (applyGlobalOverrides (x : {cairo = x.cairo_1_10_0;})); - in p.callPackage - ../applications/networking/browsers/firefox/4.0.nix { + firefox40Pkgs = callPackage ../applications/networking/browsers/firefox/4.0.nix { inherit (p.gtkLibs) gtk pango; inherit (p.gnome) libIDL; };