diff options
174 files changed, 1356 insertions, 4800 deletions
diff --git a/doc/meta.xml b/doc/meta.xml index 691bb4019bde9..8ed91d9a8c8c7 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -124,7 +124,7 @@ interpretation:</para> </section> -<section><title>Licenses</title> +<section xml:id="sec-meta-license"><title>Licenses</title> <note><para>This is just a first attempt at standardising the license attribute.</para></note> @@ -165,6 +165,18 @@ following: </varlistentry> <varlistentry> + <term><varname>bsd</varname></term> + <listitem><para>Catch-all for licenses that are essentially + similar to <link + xlink:href="http://www.gnu.org/licenses/license-list.html#ModifiedBSD">the + original BSD license with the advertising clause removed</link>, + i.e. permissive non-copyleft free software licenses. This + includes the <link + xlink:href="http://www.gnu.org/licenses/license-list.html#X11License">X11 + (“MIT”) License</link>.</para></listitem> + </varlistentry> + + <varlistentry> <term><varname>free</varname></term> <listitem><para>Catch-all for free software licenses not listed above.</para></listitem> @@ -177,6 +189,12 @@ following: </varlistentry> <varlistentry> + <term><varname>free-non-copyleft</varname></term> + <listitem><para>Catch-all for free, non-copyleft software licenses + not listed above.</para></listitem> + </varlistentry> + + <varlistentry> <term><varname>unfree-redistributable</varname></term> <listitem><para>Unfree package that can be redistributed in binary form. That is, it’s legal to redistribute the diff --git a/doc/quick-start.xml b/doc/quick-start.xml index 9f008bca8663a..6f49bee4b64e9 100644 --- a/doc/quick-start.xml +++ b/doc/quick-start.xml @@ -147,10 +147,11 @@ $ svn add pkgs/development/libraries/libfoo/default.nix</screen> <itemizedlist> <listitem> - <para>All <varname>meta</varname> attributes are optional, - but it’s still a good idea to provide at least the - <varname>description</varname> and - <varname>homepage</varname>.</para> + <para>All <varname linkend="chap-meta">meta</varname> + attributes are optional, but it’s still a good idea to + provide at least the <varname>description</varname>, + <varname>homepage</varname> and <varname + linkend="sec-meta-license">license</varname>.</para> </listitem> <listitem> diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 31e8ce58de0fb..4d1985d49115e 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, gtk, libgtkhtml, freetype +{ stdenv, fetchurl, pkgconfig, gtk, freetype , fontconfig, libart_lgpl, libtiff, libjpeg, libpng, libexif, zlib, perl , perlXMLParser, python, pygtk, gettext, xlibs, intltool, babl, gegl }: -stdenv.mkDerivation { - name = "gimp-2.6.6"; +stdenv.mkDerivation rec { + name = "gimp-2.6.7"; src = fetchurl { - url = ftp://ftp.gtk.org/pub/gimp/v2.6/gimp-2.6.6.tar.bz2; - sha256 = "0l875y4krqxxappnbw08s44bp3njjjriwyl8br5wmx25a3x63hjk"; + url = "ftp://ftp.gtk.org/pub/gimp/v2.6/${name}.tar.bz2"; + sha256 = "05g1dwxf0ydaadc8nv85akr9n240frh3f2sdrc9j90cywpxwa0d4"; }; buildInputs = [ - pkgconfig gtk libgtkhtml freetype fontconfig + pkgconfig gtk freetype fontconfig libart_lgpl libtiff libjpeg libpng libexif zlib perl perlXMLParser python pygtk gettext intltool babl gegl ]; diff --git a/pkgs/applications/misc/evince/default.nix b/pkgs/applications/misc/evince/default.nix index 837930738e854..9868254261357 100644 --- a/pkgs/applications/misc/evince/default.nix +++ b/pkgs/applications/misc/evince/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, perl, perlXMLParser, gettext, intltool , pkgconfig, glib, gtk, gnomedocutils, gnomeicontheme , libgnome, libgnomeui, scrollkeeper, libxslt -, libglade, dbus, dbus_glib +, libglade, gnome_keyring, dbus, dbus_glib , poppler, libspectre, djvulibre, shared_mime_info , makeWrapper, which , recentListSize ? null # 5 is not enough, allow passing a different number @@ -16,13 +16,11 @@ stdenv.mkDerivation rec { }; buildInputs = [ - perl perlXMLParser gettext intltool - pkgconfig glib gtk gnomedocutils gnomeicontheme - libgnome libgnomeui libglade scrollkeeper + perl perlXMLParser gettext intltool pkgconfig glib gtk + gnomedocutils gnomeicontheme libgnome libgnomeui libglade + scrollkeeper gnome_keyring libxslt # for `xsltproc' - dbus dbus_glib - poppler libspectre djvulibre - makeWrapper which + dbus dbus_glib poppler libspectre djvulibre makeWrapper which ]; configureFlags = "--with-libgnome --enable-dbus --enable-pixbuf " diff --git a/pkgs/applications/networking/browsers/firefox/3.0.nix b/pkgs/applications/networking/browsers/firefox/3.0.nix index bc5c987cd1913..4996698e7cd8b 100644 --- a/pkgs/applications/networking/browsers/firefox/3.0.nix +++ b/pkgs/applications/networking/browsers/firefox/3.0.nix @@ -11,14 +11,14 @@ rec { - firefoxVersion = "3.0.11"; + firefoxVersion = "3.0.15"; - xulVersion = "1.9.0.11"; # this attribute is used by other packages + xulVersion = "1.9.0.15"; # this attribute is used by other packages src = fetchurl { url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}-source.tar.bz2"; - sha1 = "ca792dcdb67af40c91a4fcece25d6adfb6fef2c3"; + sha1 = "06d488f0aee8f9e60dc6526c1d292f3708da301f"; }; diff --git a/pkgs/desktops/gnome-2.26/default.nix b/pkgs/desktops/gnome-2.26/default.nix deleted file mode 100644 index 245791a71c45a..0000000000000 --- a/pkgs/desktops/gnome-2.26/default.nix +++ /dev/null @@ -1,259 +0,0 @@ -pkgs: - -rec { -#### PLATFORM - audiofile = import ./platform/audiofile { - inherit (pkgs) stdenv fetchurl; - }; - - esound = import ./platform/esound { - inherit (pkgs) stdenv fetchurl pkgconfig alsaLib; - inherit audiofile; - }; - - libIDL = import ./platform/libIDL { - inherit (pkgs) stdenv fetchurl flex bison pkgconfig; - inherit (pkgs.gtkLibs) glib; - }; - - ORBit2 = import ./platform/ORBit2 { - inherit (pkgs) stdenv fetchurl pkgconfig; - inherit (pkgs.gtkLibs) glib; - inherit libIDL; - }; - - libart_lgpl = import ./platform/libart_lgpl { - inherit (pkgs) stdenv fetchurl; - }; - - libglade = import ./platform/libglade { - inherit (pkgs) stdenv fetchurl pkgconfig libxml2 expat python gettext; - inherit (pkgs.gtkLibs) gtk; - }; - - intltool = import ./platform/intltool { - inherit (pkgs) stdenv fetchurl pkgconfig perl perlXMLParser gettext; - }; - - GConf = import ./platform/GConf { - inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxml2 expat policykit; - inherit (pkgs.gtkLibs) glib gtk; - inherit intltool ORBit2; - }; - - libgnomecanvas = import ./platform/libgnomecanvas { - inherit (pkgs) stdenv fetchurl pkgconfig cairo; - inherit (pkgs.gtkLibs) glib gtk pango atk; - inherit intltool libart_lgpl libglade; - }; - - # for git-head builds - gnome_common = import platform/gnome-common { - inherit (pkgs) stdenv fetchgit pkgconfig - autoconf automake libtool; - }; - - gnome_mime_data = import ./platform/gnome-mime-data { - inherit (pkgs) stdenv fetchurl; - inherit intltool; - }; - - gnome_vfs = import ./platform/gnome-vfs { - inherit (pkgs) stdenv fetchurl pkgconfig libxml2 bzip2 openssl samba dbus_glib fam hal cdparanoia; - inherit (pkgs.gtkLibs) glib; - inherit intltool GConf gnome_mime_data; - }; - - gnome_vfs_monikers = import ./platform/gnome-vfs-monikers { - inherit (pkgs) stdenv fetchurl pkgconfig; - inherit (pkgs.gtkLibs) glib; - inherit intltool gnome_vfs libbonobo ORBit2; - }; - - libgnome = import ./platform/libgnome { - inherit (pkgs) stdenv fetchurl pkgconfig popt; - inherit (pkgs.gtkLibs) glib; - inherit intltool esound audiofile libbonobo GConf gnome_vfs ORBit2; - }; - - libgnomeui = import ./platform/libgnomeui { - inherit (pkgs) stdenv fetchurl pkgconfig libxml2 popt cairo; - inherit (pkgs.xlibs) libX11 libICE; - inherit (pkgs.gtkLibs) glib gtk atk pango; - inherit intltool libgnome libgnomecanvas libbonobo libbonoboui GConf; - inherit gnome_vfs gnome_keyring libglade libart_lgpl ORBit2; - }; - - libbonobo = import ./platform/libbonobo { - inherit (pkgs) stdenv fetchurl flex bison pkgconfig dbus_glib libxml2 popt; - inherit (pkgs.gtkLibs) glib; - inherit intltool ORBit2; - }; - - libbonoboui = import ./platform/libbonoboui { - inherit (pkgs) stdenv fetchurl bison pkgconfig popt libxml2 cairo; - inherit (pkgs.gtkLibs) glib gtk atk pango; - inherit intltool libbonobo GConf libgnomecanvas libgnome libglade ORBit2 libart_lgpl; - }; - - at_spi = import ./platform/at-spi { - inherit (pkgs) stdenv fetchurl python pkgconfig popt; - inherit (pkgs.xlibs) libX11 libICE libXtst libXi; - inherit (pkgs.gtkLibs) atk gtk; - inherit intltool libbonobo ORBit2; - }; - - gtk_doc = import ./platform/gtk-doc { - inherit (pkgs) stdenv fetchurl pkgconfig perl python libxml2 libxslt; - inherit (pkgs) docbook_xml_dtd_43 docbook_xsl; - inherit gnome_doc_utils; - }; - - # Freedesktop library - startup_notification = import ./platform/startup-notification { - inherit (pkgs) stdenv fetchurl pkgconfig; - inherit (pkgs.xlibs) libX11 libxcb libICE xcbutil libSM; - }; - - # Required for nautilus - libunique = import ./platform/libunique { - inherit (pkgs) stdenv fetchurl pkgconfig gettext; - inherit (pkgs.gtkLibs) gtk; - }; - -#### DESKTOP - - gnome_keyring = import ./desktop/gnome-keyring { - inherit (pkgs) stdenv fetchurl pkgconfig dbus libgcrypt libtasn1 pam hal python; - inherit (pkgs.gtkLibs) glib gtk; - inherit intltool GConf; - }; - - libsoup = import ./desktop/libsoup { - inherit (pkgs) stdenv fetchurl pkgconfig libxml2 gnutls libproxy sqlite curl; - inherit (pkgs.gtkLibs) glib; - inherit GConf; - }; - - # fails with a mysterious error on linking - # symbol not found although it is actually present - libsoup_git_head = import ./desktop/libsoup/git-head.nix { - inherit (pkgs) stdenv fetchgit pkgconfig libxml2 gnutls libproxy sqlite curl - automake autoconf libtool which; - glib = pkgs.gtkLibs216.glib_2_21; - inherit GConf gnome_common gtk_doc gnome_keyring; - }; - - libwnck = import ./desktop/libwnck { - inherit (pkgs) stdenv fetchurl pkgconfig; - inherit (pkgs.xlibs) libX11; - inherit (pkgs.gtkLibs) gtk; - inherit intltool; - }; - - # Not part of GNOME desktop, but provides CSS support for librsvg - libcroco = import ./desktop/libcroco { - inherit (pkgs) stdenv fetchurl pkgconfig libxml2; - inherit (pkgs.gtkLibs) glib; - }; - - librsvg = import ./desktop/librsvg { - inherit (pkgs) stdenv fetchurl pkgconfig libxml2 libgsf bzip2; - inherit (pkgs.gtkLibs) glib gtk; - inherit libcroco; - }; - - libgweather = import ./desktop/libgweather { - inherit (pkgs) stdenv fetchurl pkgconfig libxml2; - inherit (pkgs.gtkLibs) gtk; - inherit intltool GConf libsoup; - }; - - gvfs = import ./desktop/gvfs { - inherit (pkgs) stdenv fetchurl pkgconfig dbus samba hal libarchive fuse libgphoto2 cdparanoia libxml2 libtool; - inherit (pkgs.gtkLibs) glib; - inherit intltool GConf gnome_keyring libsoup; - }; - - libgnomekbd = import ./desktop/libgnomekbd { - inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxklavier; - inherit (pkgs.gtkLibs) glib gtk; - inherit intltool GConf libglade; - }; - - # Removed from recent GNOME releases, but still required - scrollkeeper = import ./desktop/scrollkeeper { - inherit (pkgs) stdenv fetchurl pkgconfig perl perlXMLParser libxml2 libxslt docbook_xml_dtd_42; - }; - - gnome_doc_utils = import ./desktop/gnome-doc-utils { - inherit (pkgs) stdenv fetchurl python pkgconfig libxml2 libxslt; - inherit intltool scrollkeeper; - }; - - zenity = import ./desktop/zenity { - inherit (pkgs) stdenv fetchurl pkgconfig cairo libxml2 libxslt; - inherit (pkgs.gtkLibs) glib gtk pango atk; - inherit gnome_doc_utils intltool libglade; - inherit (pkgs.xlibs) libX11; - }; - - metacity = import ./desktop/metacity { - inherit (pkgs) stdenv fetchurl pkgconfig; - inherit (pkgs.gtkLibs) glib gtk; - inherit (pkgs.xlibs) libXcomposite libXcursor libXdamage; - inherit intltool GConf startup_notification zenity gnome_doc_utils; - }; - - gnome_menus = import ./desktop/gnome-menus { - inherit (pkgs) stdenv fetchurl pkgconfig python; - inherit (pkgs.gtkLibs) glib; - inherit intltool; - }; - - gnome_desktop = import ./desktop/gnome-desktop { - inherit (pkgs) stdenv fetchurl pkgconfig python libxslt which; - libxml2 = pkgs.libxml2Python; - inherit (pkgs.xlibs) libX11; - inherit (pkgs.gtkLibs) gtk; - inherit intltool GConf gnome_doc_utils; - }; - - gnome_panel = import ./desktop/gnome-panel { - inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib dbus cairo popt which bzip2 python libxslt; - libxml2 = pkgs.libxml2Python; - inherit (pkgs.gtkLibs) glib gtk pango atk; - inherit (pkgs.xlibs) libXau; - inherit intltool ORBit2 libglade libgnome libgnomeui libbonobo libbonoboui GConf gnome_menus gnome_desktop; - inherit libwnck librsvg libgweather gnome_doc_utils libgnomecanvas libart_lgpl; - }; - - gnome_session = import ./desktop/gnome-session { - inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib cairo dbus; - inherit (pkgs.gtkLibs) gtk pango atk; - inherit (pkgs.xlibs) libXau libXtst inputproto; - inherit intltool libglade startup_notification GConf; - }; - - gnome_settings_daemon = import ./desktop/gnome-settings-daemon { - inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxklavier; - inherit (pkgs.gtkLibs) gtk; - inherit intltool GConf gnome_desktop libglade libgnomekbd; - }; - - gnome_control_center = import ./desktop/gnome-control-center { - inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxklavier hal; - inherit (pkgs) cairo popt which python libxslt shared_mime_info desktop_file_utils; - inherit (pkgs.gtkLibs) glib gtk pango atk; - inherit gnome_doc_utils intltool GConf libglade libgnome libgnomeui libgnomekbd; - inherit librsvg gnome_menus gnome_desktop gnome_panel metacity gnome_settings_daemon; - inherit libbonobo libbonoboui libgnomecanvas libart_lgpl gnome_vfs ORBit2; - libxml2 = pkgs.libxml2Python; - }; - - nautilus = import ./desktop/nautilus { - inherit (pkgs) stdenv fetchurl pkgconfig libxml2 dbus_glib libexif shared_mime_info; - inherit (pkgs.gtkLibs) gtk; - inherit gnome_desktop libunique intltool GConf; - }; -} diff --git a/pkgs/desktops/gnome-2.26/desktop/gnome-control-center/default.nix b/pkgs/desktops/gnome-2.26/desktop/gnome-control-center/default.nix deleted file mode 100644 index 6a7d54b8f09e0..0000000000000 --- a/pkgs/desktops/gnome-2.26/desktop/gnome-control-center/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, libxklavier, hal, cairo, popt, which, python -, shared_mime_info, desktop_file_utils -, glib, gtk, pango, atk, gnome_doc_utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd -, librsvg, gnome_menus, gnome_desktop, gnome_panel, metacity, gnome_settings_daemon -, libbonobo, libbonoboui, libgnomecanvas, libart_lgpl, gnome_vfs, ORBit2}: - -stdenv.mkDerivation { - name = "gnome-control-center-2.26.0"; - src = fetchurl { - url = mirror://gnome/desktop/2.26/2.26.2/sources/gnome-control-center-2.26.0.tar.bz2; - sha256 = "01cwx784whzz9pnn3xvjgwqjyb187bmr56r5qm9im5sk23m89yv2"; - }; - buildInputs = [ pkgconfig dbus_glib libxml2 libxslt libxklavier hal popt which python shared_mime_info desktop_file_utils - gtk gnome_doc_utils intltool GConf libglade libgnomekbd - libgnomeui librsvg gnome_menus gnome_desktop gnome_panel metacity gnome_settings_daemon ]; - configureFlags = "--disable-scrollkeeper"; - # This makes me cry - CPPFLAGS = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include "+ - "-I${gtk}/include/gtk-2.0 -I${gtk}/lib/gtk-2.0/include -I${cairo}/include/cairo "+ - "-I${pango}/include/pango-1.0 -I${atk}/include/atk-1.0 "+ - "-I${gnome_desktop}/include/gnome-desktop-2.0 -I${gnome_menus}/include/gnome-menus "+ - "-I${libgnomeui}/include/libgnomeui-2.0 -I${libbonoboui}/include/libbonoboui-2.0 "+ - "-I${libgnomecanvas}/include/libgnomecanvas-2.0 -I${libart_lgpl}/include/libart-2.0 "+ - "-I${libgnome}/include/libgnome-2.0 -I${gnome_vfs}/include/gnome-vfs-2.0 "+ - "-I${libbonobo}/include/libbonobo-2.0 -I${libbonobo}/include/bonobo-activation-2.0 "+ - "-I${ORBit2}/include/orbit-2.0 -I${GConf}/include/gconf/2 -I${librsvg}/include/librsvg-2 "+ - "-I${gnome_panel}/include/panel-2.0"; - LIBS = "-lXft -lglib-2.0 -lgtk-x11-2.0 -lrsvg-2 -lgconf-2 -lgnome-desktop-2 -lgnome-menu -lgnomeui-2"; -} diff --git a/pkgs/desktops/gnome-2.26/desktop/gnome-desktop/default.nix b/pkgs/desktops/gnome-2.26/desktop/gnome-desktop/default.nix deleted file mode 100644 index ae6651aac32e5..0000000000000 --- a/pkgs/desktops/gnome-2.26/desktop/gnome-desktop/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, python, libxml2, libxslt, which, libX11, gtk -, intltool, GConf, gnome_doc_utils}: - -stdenv.mkDerivation { - name = "gnome-desktop-2.26.2"; - src = fetchurl { - url = mirror://gnome/desktop/2.26/2.26.2/sources/gnome-desktop-2.26.2.tar.bz2; - sha256 = "0aphqbrgczcng1wgkgjkcy5nw88y407d4flcs0bszicqrvzsyl2d"; - }; - configureFlags = "--disable-scrollkeeper"; - buildInputs = [ pkgconfig python libxml2 libxslt which libX11 gtk - intltool GConf gnome_doc_utils ]; -} diff --git a/pkgs/desktops/gnome-2.26/desktop/gnome-doc-utils/default.nix b/pkgs/desktops/gnome-2.26/desktop/gnome-doc-utils/default.nix deleted file mode 100644 index fae5003519e83..0000000000000 --- a/pkgs/desktops/gnome-2.26/desktop/gnome-doc-utils/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{stdenv, fetchurl, python, pkgconfig, libxml2, libxslt, intltool, scrollkeeper}: - -stdenv.mkDerivation { - name = "gnome-doc-utils-0.16.1"; - src = fetchurl { - url = mirror://gnome/desktop/2.26/2.26.2/sources/gnome-doc-utils-0.16.1.tar.bz2; - sha256 = "0j722qk8drib65abbjsva0cq25wzq7adag9m7hxjpi7wdvqcgq3k"; - }; - configureFlags = "--disable-scrollkeeper"; - buildInputs = [ python pkgconfig libxml2 libxslt intltool scrollkeeper ]; -} diff --git a/pkgs/desktops/gnome-2.26/desktop/gnome-keyring/default.nix b/pkgs/desktops/gnome-2.26/desktop/gnome-keyring/default.nix deleted file mode 100644 index 80c5578390d11..0000000000000 --- a/pkgs/desktops/gnome-2.26/desktop/gnome-keyring/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, hal, python, glib, gtk, intltool, GConf}: - -stdenv.mkDerivation { - name = "gnome-keyring-2.26.1"; - src = fetchurl { - url = mirror://gnome/desktop/2.26/2.26.2/sources/gnome-keyring-2.26.1.tar.bz2; - sha256 = "09krpx4nrcrf0ghvfcpg3gxnna6a97drya36ypcijb35cdwrm9s7"; - }; - buildInputs = [ pkgconfig dbus.libs libgcrypt libtasn1 pam hal python glib gtk intltool GConf ]; -} diff --git a/pkgs/desktops/gnome-2.26/desktop/gnome-menus/default.nix b/pkgs/desktops/gnome-2.26/desktop/gnome-menus/default.nix deleted file mode 100644 index fabd18bf1c002..0000000000000 --- a/pkgs/desktops/gnome-2.26/desktop/gnome-menus/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchurl, pkgconfig, python, glib, intltool}: - -stdenv.mkDerivation { - name = "gnome-menus-2.26.1"; - src = fetchurl { - url = mirror://gnome/desktop/2.26/2.26.2/sources/gnome-menus-2.26.1.tar.bz2; - sha256 = "1r44zrmkb2s29f32q8pn06khr50s3b2kcbmkgfl5gvrsczv9cmia"; - }; - buildInputs = [ pkgconfig python glib intltool ]; -} diff --git a/pkgs/desktops/gnome-2.26/desktop/gnome-panel/default.nix b/pkgs/desktops/gnome-2.26/desktop/gnome-panel/default.nix deleted file mode 100644 index 82dfea538c26d..0000000000000 --- a/pkgs/desktops/gnome-2.26/desktop/gnome-panel/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, dbus, cairo, popt, which, libxml2, libxslt, bzip2, python -, glib, gtk, pango, atk, libXau -, intltool, ORBit2, libglade, libgnome, libgnomeui, libbonobo, libbonoboui, GConf, gnome_menus, gnome_desktop -, libwnck, librsvg, libgweather, gnome_doc_utils, libgnomecanvas, libart_lgpl}: - -stdenv.mkDerivation { - name = "gnome-panel-2.26.2"; - src = fetchurl { - url = mirror://gnome/desktop/2.26/2.26.2/sources/gnome-panel-2.26.2.tar.bz2; - sha256 = "1sghh2jj306ckdh65c73kqrdpx3zx7j4bbw9gj65wsad3hv40hgb"; - }; - buildInputs = [ pkgconfig gtk dbus_glib popt which libxml2 libxslt bzip2 python libXau - intltool ORBit2 libglade libgnome libgnomeui libbonobo libbonoboui GConf gnome_menus gnome_desktop - libwnck librsvg libgweather gnome_doc_utils ]; - configureFlags = "--disable-scrollkeeper"; - CPPFLAGS = "-I${glib}/include/glib-2.0 -I${glib}/include/gio-unix-2.0 -I${glib}/lib/glib-2.0/include -I${dbus_glib}/include/dbus-1.0 -I${dbus.libs}/include/dbus-1.0 "+ - "-I${gtk}/include/gtk-2.0 -I${gtk}/lib/gtk-2.0/include -I${cairo}/include/cairo -I${pango}/include/pango-1.0 "+ - "-I${atk}/include/atk-1.0 -I${ORBit2}/include/orbit-2.0 -I${libbonobo}/include/bonobo-activation-2.0 "+ - "-I${libgnomeui}/include/libgnomeui-2.0 -I${libgnome}/include/libgnome-2.0 -I${GConf}/include/gconf/2 "+ - "-I${libglade}/include/libglade-2.0 -I${gnome_menus}/include/gnome-menus -I${gnome_desktop}/include/gnome-desktop-2.0 "+ - "-I${libbonoboui}/include/libbonoboui-2.0 -I${libbonobo}/include/libbonobo-2.0 -I${libgnomecanvas}/include/libgnomecanvas-2.0 "+ - "-I${libart_lgpl}/include/libart-2.0 -I${librsvg}/include/librsvg-2 -I${libwnck}/include/libwnck-1.0"; - LIBS = "-lORBit-2 -lbonobo-2 -lgtk-x11-2.0 -lgconf-2 -lgnomeui-2 -lglade-2.0 -lgnome-menu -lgnome-desktop-2 -lrsvg-2 -lwnck-1"; -} diff --git a/pkgs/desktops/gnome-2.26/desktop/gnome-session/default.nix b/pkgs/desktops/gnome-2.26/desktop/gnome-session/default.nix deleted file mode 100644 index 79f58c64d2f0c..0000000000000 --- a/pkgs/desktops/gnome-2.26/desktop/gnome-session/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, cairo, dbus, gtk, pango, atk, libXau, libXtst, inputproto -, intltool, libglade, startup_notification, GConf}: - -stdenv.mkDerivation { - name = "gnome-session-2.26.1"; - src = fetchurl { - url = mirror://gnome/desktop/2.26/2.26.2/sources/gnome-session-2.26.1.tar.bz2; - sha256 = "0cmw1p07gw7bjiq31mmm7fjhr84zq7x7rzbphfws4sgd8bn09qrm"; - }; - buildInputs = [ pkgconfig dbus_glib gtk libXau libXtst inputproto intltool libglade startup_notification GConf ]; - CPPFLAGS = "-I${gtk}/include/gtk-2.0 -I${gtk}/lib/gtk-2.0/include -I${dbus_glib}/include/dbus-1.0 "+ - "-I${pango}/include/pango-1.0 -I${atk}/include/atk-1.0 -I${cairo}/include/cairo "+ - "-I${dbus.libs}/include/dbus-1.0 -I${dbus.libs}/lib/dbus-1.0/include "+ - "-I${libglade}/include/libglade-2.0"; - LIBS = "-lglade-2.0 -ldbus-glib-1"; -} diff --git a/pkgs/desktops/gnome-2.26/desktop/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-2.26/desktop/gnome-settings-daemon/default.nix deleted file mode 100644 index d00cada7ea267..0000000000000 --- a/pkgs/desktops/gnome-2.26/desktop/gnome-settings-daemon/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, libxklavier, gtk -, intltool, GConf, gnome_desktop, libglade, libgnomekbd}: - -stdenv.mkDerivation { - name = "gnome-settings-daemon-2.26.1"; - src = fetchurl { - url = mirror://gnome/desktop/2.26/2.26.2/sources/gnome-settings-daemon-2.26.1.tar.bz2; - sha256 = "100ax9dfcd0wzfsdv4p75qq950hqvpqnsa315wq5wj7yhjm1vzsd"; - }; - buildInputs = [ pkgconfig intltool dbus_glib libxklavier gtk GConf gnome_desktop libglade libgnomekbd ]; -} diff --git a/pkgs/desktops/gnome-2.26/desktop/gvfs/builder.sh b/pkgs/desktops/gnome-2.26/desktop/gvfs/builder.sh deleted file mode 100644 index 5be453c09a24d..0000000000000 --- a/pkgs/desktops/gnome-2.26/desktop/gvfs/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -source $stdenv/setup - -myPatchPhase() -{ - sed -i -e "/giomodulesdir=/ agiomodulesdir=$out/lib/gio" configure -} - -patchPhase=myPatchPhase -genericBuild diff --git a/pkgs/desktops/gnome-2.26/desktop/gvfs/default.nix b/pkgs/desktops/gnome-2.26/desktop/gvfs/default.nix deleted file mode 100644 index 8ecceda63d5cc..0000000000000 --- a/pkgs/desktops/gnome-2.26/desktop/gvfs/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus, samba, hal, libarchive, fuse, libgphoto2 -, cdparanoia, libxml2, libtool, glib, intltool, GConf, gnome_keyring, libsoup}: - -stdenv.mkDerivation { - name = "gvfs-1.2.3"; - src = fetchurl { - url = mirror://gnome/desktop/2.26/2.26.2/sources/gvfs-1.2.3.tar.bz2; - sha256 = "0yaq7qi9da963ppp7jlgac3zzwlhczpp1swdbaklnl343c64hp9r"; - }; - builder = ./builder.sh; - buildInputs = [ pkgconfig dbus.libs samba hal libarchive fuse libgphoto2 cdparanoia libxml2 libtool - glib intltool GConf gnome_keyring libsoup ]; -} diff --git a/pkgs/desktops/gnome-2.26/desktop/libcroco/default.nix b/pkgs/desktops/gnome-2.26/desktop/libcroco/default.nix deleted file mode 100644 index e724940e31df3..0000000000000 --- a/pkgs/desktops/gnome-2.26/desktop/libcroco/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchurl, pkgconfig, libxml2, glib}: - -stdenv.mkDerivation { - name = "libcroco-0.6.2"; - src = fetchurl { - url = mirror://gnome/sources/libcroco/0.6/libcroco-0.6.2.tar.bz2; - sha256 = "0j8p6xlpdhhbzjznr7rx7jiy3fi95qib0gsnkv9n76y0chzqa95y"; - }; - buildInputs = [ pkgconfig libxml2 glib ]; -} diff --git a/pkgs/desktops/gnome-2.26/desktop/libgnomekbd/default.nix b/pkgs/desktops/gnome-2.26/desktop/libgnomekbd/default.nix deleted file mode 100644 index 1a0ff9f51b793..0000000000000 --- a/pkgs/desktops/gnome-2.26/desktop/libgnomekbd/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchurl, pkgconfig, dbus_glib, libxklavier, glib, gtk, intltool, GConf, libglade}: - -stdenv.mkDerivation { - name = "libgnomekbd-2.26.0"; - src = fetchurl { - url = mirror://gnome/desktop/2.26/2.26.2/sources/libgnomekbd-2.26.0.tar.bz2; - sha256 = "0krn24c7c207vhsaizz5vybyni2rc2x245p3hv9sivgayd93b996"; - }; - buildInputs = [ pkgconfig dbus_glib libxklavier glib gtk intltool GConf libglade ]; -} diff --git a/pkgs/desktops/gnome-2.26/desktop/libgweather/default.nix b/pkgs/desktops/gnome-2.26/desktop/libgweather/default.nix deleted file mode 100644 index 524e6b415db34..0000000000000 --- a/pkgs/desktops/gnome-2.26/desktop/libgweather/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, GConf, libsoup}: - -stdenv.mkDerivation { - name = "libgweather-2.26.1"; - src = fetchurl { - url = mirror://gnome/desktop/2.26/2.26.2/sources/libgweather-2.26.1.tar.bz2; - sha256 = "0hhqf4w5n3jxsl2g1a772vawlpkj4k59nikil3a6z1pcw3gygkdc"; - }; - configureFlags = "--with-zoneinfo-dir=${stdenv.glibc}/share/zoneinfo"; - buildInputs = [ pkgconfig libxml2 gtk intltool GConf libsoup ]; -} diff --git a/pkgs/desktops/gnome-2.26/desktop/librsvg/default.nix b/pkgs/desktops/gnome-2.26/desktop/librsvg/default.nix deleted file mode 100644 index e8b42df29d37e..0000000000000 --- a/pkgs/desktops/gnome-2.26/desktop/librsvg/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchurl, pkgconfig, libxml2, libgsf, bzip2, glib, gtk, libcroco}: - -stdenv.mkDerivation { - name = "librsvg-2.26.0"; - src = fetchurl { - url = mirror://gnome/desktop/2.26/2.26.2/sources/librsvg-2.26.0.tar.bz2; - sha256 = "1sivagvlyr58hxgazr6pyq3yfxbg0wrv7rgzsk5xi631v3qbbjpx"; - }; - buildInputs = [ pkgconfig libxml2 libgsf bzip2 glib gtk libcroco ]; -} diff --git a/pkgs/desktops/gnome-2.26/desktop/libsoup/default.nix b/pkgs/desktops/gnome-2.26/desktop/libsoup/default.nix deleted file mode 100644 index c6aec57c805b0..0000000000000 --- a/pkgs/desktops/gnome-2.26/desktop/libsoup/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchurl, pkgconfig, libxml2, gnutls, libproxy, sqlite, curl, glib, GConf}: - -stdenv.mkDerivation { - name = "libsoup-2.27.4"; - src = fetchurl { - url = mirror://gnome/desktop/2.27/2.27.4/sources/libsoup-2.27.4.tar.bz2; - sha256 = "4d67aa8d2d3c719b67bde58ca3b8a94aa1d172bc242672401d7f3d22685065b9"; - }; - buildInputs = [ pkgconfig libxml2 gnutls libproxy sqlite curl glib GConf ]; -} diff --git a/pkgs/desktops/gnome-2.26/desktop/libsoup/git-head.nix b/pkgs/desktops/gnome-2.26/desktop/libsoup/git-head.nix deleted file mode 100644 index 7c046ca9d513b..0000000000000 --- a/pkgs/desktops/gnome-2.26/desktop/libsoup/git-head.nix +++ /dev/null @@ -1,21 +0,0 @@ -{stdenv, fetchgit, pkgconfig, libxml2, gnutls, libproxy, sqlite, curl, glib, GConf - , autoconf, automake, libtool, which - , gnome_common, gtk_doc, gnome_keyring - }: - -stdenv.mkDerivation { - name = "libsoup-2.27.git"; - src = fetchgit { - url = git://git.gnome.org/libsoup; - rev = "3d0441b3f0c402447306f53789a47abdc573f8f3"; - md5 = "22379acc77cb6a381bd0abf69ae75ca8"; - }; - buildInputs = [ pkgconfig libxml2 gnutls libproxy sqlite curl glib GConf - automake autoconf libtool which gnome_common gtk_doc gnome_keyring - ]; - preConfigure = '' - export ACLOCAL_FLAGS='-I ${pkgconfig}/share/aclocal -I ${gtk_doc}/share/aclocal -I ${libtool}/share/aclocal' - ./autogen.sh - ''; - configureFlags = ["--without-gnome"]; -} diff --git a/pkgs/desktops/gnome-2.26/desktop/libwnck/default.nix b/pkgs/desktops/gnome-2.26/desktop/libwnck/default.nix deleted file mode 100644 index 1cd96dd4fdc64..0000000000000 --- a/pkgs/desktops/gnome-2.26/desktop/libwnck/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchurl, pkgconfig, libX11, gtk, intltool}: - -stdenv.mkDerivation { - name = "libwnck-2.26.1"; - src = fetchurl { - url = mirror://gnome/desktop/2.26/2.26.2/sources/libwnck-2.26.1.tar.bz2; - sha256 = "0c7l4p2iarl7vd69nskhqb76j8p5dvnf45rmm3a1c3ajrhmpnwsk"; - }; - buildInputs = [ pkgconfig libX11 gtk intltool ]; -} diff --git a/pkgs/desktops/gnome-2.26/desktop/metacity/default.nix b/pkgs/desktops/gnome-2.26/desktop/metacity/default.nix deleted file mode 100644 index f4f21b1f10891..0000000000000 --- a/pkgs/desktops/gnome-2.26/desktop/metacity/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk, libXcomposite, libXcursor, libXdamage -, intltool, GConf, startup_notification, zenity, gnome_doc_utils}: - -stdenv.mkDerivation { - name = "metacity-2.26.0"; - src = fetchurl { - url = mirror://gnome/desktop/2.26/2.26.2/sources/metacity-2.26.0.tar.bz2; - sha256 = "0y4hamalbplpsilyfbs1c8za6f7cgp9p4kcswsx67ncr310idfi9"; - }; - buildInputs = [ pkgconfig glib gtk libXcomposite libXcursor libXdamage - intltool GConf startup_notification zenity gnome_doc_utils ]; -} diff --git a/pkgs/desktops/gnome-2.26/desktop/nautilus/default.nix b/pkgs/desktops/gnome-2.26/desktop/nautilus/default.nix deleted file mode 100644 index 5e25c141271e8..0000000000000 --- a/pkgs/desktops/gnome-2.26/desktop/nautilus/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif, gtk, gnome_desktop, libunique, intltool, GConf}: - -stdenv.mkDerivation { - name = "nautilus-2.26.3"; - src = fetchurl { - url = mirror://gnome/desktop/2.26/2.26.2/sources/nautilus-2.26.3.tar.bz2; - sha256 = "1qfzw3aqyixybvxlj768l3a1knp0f0knpvs5566advpil1i771qx"; - }; - buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk gnome_desktop libunique intltool GConf ]; -} diff --git a/pkgs/desktops/gnome-2.26/desktop/scrollkeeper/default.nix b/pkgs/desktops/gnome-2.26/desktop/scrollkeeper/default.nix deleted file mode 100644 index 050b05059373c..0000000000000 --- a/pkgs/desktops/gnome-2.26/desktop/scrollkeeper/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}: - -stdenv.mkDerivation { - name = "scrollkeeper-0.3.14"; - src = fetchurl { - url = mirror://gnome/desktop/2.16/2.16.3/sources/scrollkeeper-0.3.14.tar.bz2; - sha256 = "08n1xgj1f53zahwm0wpn3jid3rfbhi3iwby0ilaaldnid5qriqgc"; - }; - preConfigure = " - substituteInPlace extract/dtds/Makefile.am --replace /usr/bin/xmlcatalog xmlcatalog - "; - buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt]; - configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat"; -} diff --git a/pkgs/desktops/gnome-2.26/desktop/zenity/default.nix b/pkgs/desktops/gnome-2.26/desktop/zenity/default.nix deleted file mode 100644 index 0bba8870e396a..0000000000000 --- a/pkgs/desktops/gnome-2.26/desktop/zenity/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, glib, gtk, pango, atk, gnome_doc_utils, intltool, libglade, - libX11}: - -stdenv.mkDerivation { - name = "zenity-2.26.0"; - src = fetchurl { - url = mirror://gnome/desktop/2.26/2.26.2/sources/zenity-2.26.0.tar.bz2; - sha256 = "1882sh83jp3drg5z61rghdshnsfys4jgbgg7za7b9jlhr8ar4qgw"; - }; - configureFlags = "--disable-scrollkeeper"; - buildInputs = [ pkgconfig gtk gnome_doc_utils intltool libglade libxml2 libxslt libX11]; - CPPFLAGS = "-I${cairo}/include/cairo -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include "+ - "-I${gtk}/include/gtk-2.0 -I${gtk}/lib/gtk-2.0/include -I${pango}/include/pango-1.0 "+ - "-I${atk}/include/atk-1.0 -I${libglade}/include/libglade-2.0"; - LIBS = "-lgtk-x11-2.0 -lglade-2.0 -lX11"; -} diff --git a/pkgs/desktops/gnome-2.26/platform/GConf/default.nix b/pkgs/desktops/gnome-2.26/platform/GConf/default.nix deleted file mode 100644 index bd3265b2eb9a2..0000000000000 --- a/pkgs/desktops/gnome-2.26/platform/GConf/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, glib, gtk, ORBit2, libxml2 -, expat, policykit, intltool}: - -stdenv.mkDerivation { - name = "GConf-2.26.2"; - src = fetchurl { - url = mirror://gnome/platform/2.26/2.26.2/sources/GConf-2.26.2.tar.bz2; - sha256 = "1vb7hjxddy54g4vch936621g66n0mhi3wkhm9lwqh449vdqg4yki"; - }; - buildInputs = [ pkgconfig glib gtk dbus_glib ORBit2 libxml2 - expat policykit intltool ]; -} diff --git a/pkgs/desktops/gnome-2.26/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2.26/platform/ORBit2/default.nix deleted file mode 100644 index bf0016d23167e..0000000000000 --- a/pkgs/desktops/gnome-2.26/platform/ORBit2/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchurl, pkgconfig, glib, libIDL}: - -stdenv.mkDerivation { - name = "ORBit2-2.14.17"; - src = fetchurl { - url = mirror://gnome/platform/2.26/2.26.2/sources/ORBit2-2.14.17.tar.bz2; - sha256 = "0k4px2f949ac7vmj7b155g1rpf7pmvl48sbnkjhlg4wgcwzwxgv2"; - }; - buildInputs = [ pkgconfig glib libIDL ]; -} diff --git a/pkgs/desktops/gnome-2.26/platform/at-spi/default.nix b/pkgs/desktops/gnome-2.26/platform/at-spi/default.nix deleted file mode 100644 index ae92e11874e0b..0000000000000 --- a/pkgs/desktops/gnome-2.26/platform/at-spi/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, fetchurl, python, pkgconfig, popt, atk, gtk, libX11, libICE, libXtst, libXi -, intltool, libbonobo, ORBit2}: - -stdenv.mkDerivation { - name = "at-spi-1.26.0"; - src = fetchurl { - url = mirror://gnome/platform/2.26/2.26.2/sources/at-spi-1.26.0.tar.bz2; - sha256 = "0kb4n9xi66igg6fgs64q44cskx45v9mgn5psfbqpbykpl9rr935v"; - }; - buildInputs = [ python pkgconfig popt atk gtk libX11 libICE libXtst libXi - intltool libbonobo ORBit2 ]; -} diff --git a/pkgs/desktops/gnome-2.26/platform/audiofile/default.nix b/pkgs/desktops/gnome-2.26/platform/audiofile/default.nix deleted file mode 100644 index 9994b79db5336..0000000000000 --- a/pkgs/desktops/gnome-2.26/platform/audiofile/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "audiofile-0.2.6"; - src = fetchurl { - url = mirror://gnome/platform/2.26/2.26.2/sources/audiofile-0.2.6.tar.bz2; - sha256 = "1d00w9hxx3flfs6cjyja99y8vpj1qwa34zfdj96dpa54drd9da62"; - }; -} diff --git a/pkgs/desktops/gnome-2.26/platform/esound/default.nix b/pkgs/desktops/gnome-2.26/platform/esound/default.nix deleted file mode 100644 index a1502d3fbbc63..0000000000000 --- a/pkgs/desktops/gnome-2.26/platform/esound/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchurl, pkgconfig, alsaLib, audiofile}: - -stdenv.mkDerivation { - name = "esound-0.2.41"; - src = fetchurl { - url = mirror://gnome/platform/2.26/2.26.2/sources/esound-0.2.41.tar.bz2; - sha256 = "5eb5dd29a64b3462a29a5b20652aba7aa926742cef43577bf0796b787ca34911"; - }; - buildInputs = [ pkgconfig alsaLib audiofile ]; -} diff --git a/pkgs/desktops/gnome-2.26/platform/gnome-common/default.nix b/pkgs/desktops/gnome-2.26/platform/gnome-common/default.nix deleted file mode 100644 index f6cd1310c8f10..0000000000000 --- a/pkgs/desktops/gnome-2.26/platform/gnome-common/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{stdenv, fetchgit, pkgconfig, autoconf, automake, libtool}: - -stdenv.mkDerivation { - name = "gnome-common-git"; - src = fetchgit { - url = git://git.gnome.org/gnome-common; - rev = "53ca82d81d93b52bc057d649247eb18549a86d55"; - md5 = "a3e4c471c73af14d87fa753c2ee05f15"; - }; - buildInputs = [ pkgconfig automake autoconf libtool - ]; - preConfigure = '' - ./autogen.sh - ''; -} diff --git a/pkgs/desktops/gnome-2.26/platform/gnome-mime-data/default.nix b/pkgs/desktops/gnome-2.26/platform/gnome-mime-data/default.nix deleted file mode 100644 index ec12b31028163..0000000000000 --- a/pkgs/desktops/gnome-2.26/platform/gnome-mime-data/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchurl, intltool}: - -stdenv.mkDerivation { - name = "gnome-mime-data-2.18.0"; - src = fetchurl { - url = mirror://gnome/platform/2.26/2.26.2/sources/gnome-mime-data-2.18.0.tar.bz2; - sha256 = "1mvg8glb2a40yilmyabmb7fkbzlqd3i3d31kbkabqnq86xdnn69p"; - }; - buildInputs = [ intltool ]; -} diff --git a/pkgs/desktops/gnome-2.26/platform/gnome-vfs-monikers/default.nix b/pkgs/desktops/gnome-2.26/platform/gnome-vfs-monikers/default.nix deleted file mode 100644 index afe1da84f26cf..0000000000000 --- a/pkgs/desktops/gnome-2.26/platform/gnome-vfs-monikers/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, pkgconfig, glib, intltool, gnome_vfs, libbonobo, ORBit2}: - -stdenv.mkDerivation { - name = "gnome-vfs-monikers-2.15.3"; - src = fetchurl { - url = mirror://gnome/platform/2.26/2.26.2/sources/gnome-vfs-monikers-2.15.3.tar.bz2; - sha256 = "0gpgk5vwhgqfhrd8pf1314kh7sv3jfqll2xbdbrs5s5sxy3v7b15"; - }; - buildInputs = [ pkgconfig glib intltool gnome_vfs libbonobo ]; - CPPFLAGS = "-I${libbonobo}/include/libbonobo-2.0 -I${libbonobo}/include/bonobo-activation-2.0 "+ - "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${ORBit2}/include/orbit-2.0 "+ - "-I${gnome_vfs}/include/gnome-vfs-2.0"; -} diff --git a/pkgs/desktops/gnome-2.26/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2.26/platform/gnome-vfs/default.nix deleted file mode 100644 index 3e8b78b9a9125..0000000000000 --- a/pkgs/desktops/gnome-2.26/platform/gnome-vfs/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, samba, dbus_glib, glib, fam, hal, cdparanoia -, intltool, GConf, gnome_mime_data}: - -stdenv.mkDerivation { - name = "gnome-vfs-2.24.1"; - src = fetchurl { - url = mirror://gnome/platform/2.26/2.26.2/sources/gnome-vfs-2.24.1.tar.bz2; - sha256 = "1dmyr8nj77717r8dhwkixpar2yp8ld3r683gp222n59v61718ndw"; - }; - buildInputs = [ pkgconfig libxml2 bzip2 openssl samba dbus_glib glib fam hal cdparanoia - intltool GConf gnome_mime_data ]; -} diff --git a/pkgs/desktops/gnome-2.26/platform/gtk-doc/default.nix b/pkgs/desktops/gnome-2.26/platform/gtk-doc/default.nix deleted file mode 100644 index 4017490254ffa..0000000000000 --- a/pkgs/desktops/gnome-2.26/platform/gtk-doc/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{stdenv, fetchurl, pkgconfig, perl, python, libxml2, libxslt, docbook_xml_dtd_43, docbook_xsl, gnome_doc_utils}: - -stdenv.mkDerivation { - name = "gtk-doc-1.11"; - src = fetchurl { - url = mirror://gnome/platform/2.26/2.26.2/sources/gtk-doc-1.11.tar.bz2; - sha256 = "08zz6gn90aqps84hfhdgarsilbdj0bbnj3wjm2x552n4i7gmq4wj"; - }; - - # maybe there is a better way to pass the needed dtd and xsl files - # "-//OASIS//DTD DocBook XML V4.1.2//EN" and "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl" - preConfigure = '' - ensureDir $out/nix-support - cat > $out/nix-support/catalog.xml << EOF - <?xml version="1.0"?> - <!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd"> - <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> - <nextCatalog catalog="${docbook_xsl}/xml/xsl/docbook/catalog.xml" /> - <nextCatalog catalog="${docbook_xml_dtd_43}/xml/dtd/docbook/catalog.xml" /> - </catalog> - EOF - - configureFlags="--with-xml-catalog=$out/nix-support/catalog.xml --disable-scrollkeeper"; - ''; - - buildInputs = [ pkgconfig perl python libxml2 libxslt docbook_xml_dtd_43 gnome_doc_utils ]; -} diff --git a/pkgs/desktops/gnome-2.26/platform/intltool/default.nix b/pkgs/desktops/gnome-2.26/platform/intltool/default.nix deleted file mode 100644 index daa0230f983e9..0000000000000 --- a/pkgs/desktops/gnome-2.26/platform/intltool/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gettext}: - -stdenv.mkDerivation rec { - name = "intltool-0.40.6"; - - src = fetchurl { - url = "mirror://gnome/sources/intltool/0.40/${name}.tar.bz2"; - sha256 = "0r1vkvy5xzqk01yl6a0xlrry39bra24alkrx6279b77hc62my7jd"; - }; - - buildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ perl perlXMLParser gettext ]; -} diff --git a/pkgs/desktops/gnome-2.26/platform/libIDL/default.nix b/pkgs/desktops/gnome-2.26/platform/libIDL/default.nix deleted file mode 100644 index 54e67c25e50ff..0000000000000 --- a/pkgs/desktops/gnome-2.26/platform/libIDL/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchurl, flex, bison, pkgconfig, glib}: - -stdenv.mkDerivation { - name = "libIDL-0.8.13"; - src = fetchurl { - url = mirror://gnome/platform/2.26/2.26.2/sources/libIDL-0.8.13.tar.bz2; - sha256 = "bccc7e10dae979518ff012f8464e47ec4b3558a5456a94c8679653aa0b262b71"; - }; - buildInputs = [ flex bison pkgconfig glib ]; -} diff --git a/pkgs/desktops/gnome-2.26/platform/libart_lgpl/default.nix b/pkgs/desktops/gnome-2.26/platform/libart_lgpl/default.nix deleted file mode 100644 index e993c9924a68c..0000000000000 --- a/pkgs/desktops/gnome-2.26/platform/libart_lgpl/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "libart_lgpl-2.3.20"; - src = fetchurl { - url = mirror://gnome/platform/2.26/2.26.2/sources/libart_lgpl-2.3.20.tar.bz2; - sha256 = "0iyqsc517lj8xnidchnk0fxa6aqvss4hv8p9fk6bba86lbiillym"; - }; -} diff --git a/pkgs/desktops/gnome-2.26/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2.26/platform/libbonobo/default.nix deleted file mode 100644 index 54960a0f4aff7..0000000000000 --- a/pkgs/desktops/gnome-2.26/platform/libbonobo/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchurl, flex, bison, pkgconfig, glib, dbus_glib, libxml2, popt, intltool, ORBit2}: - -stdenv.mkDerivation { - name = "libbonobo-2.24.1"; - src = fetchurl { - url = mirror://gnome/platform/2.26/2.26.2/sources/libbonobo-2.24.1.tar.bz2; - sha256 = "0x0jx5bf9nrh7djq90vj7zryixgws6ir8py6pczwjb3bp1carcj2"; - }; - buildInputs = [ flex bison pkgconfig glib dbus_glib libxml2 popt intltool ORBit2 ]; -} diff --git a/pkgs/desktops/gnome-2.26/platform/libbonoboui/default.nix b/pkgs/desktops/gnome-2.26/platform/libbonoboui/default.nix deleted file mode 100644 index caf9e54e68da6..0000000000000 --- a/pkgs/desktops/gnome-2.26/platform/libbonoboui/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, bison, pkgconfig, popt, libxml2, cairo, glib, gtk, atk, pango -, intltool, libbonobo, GConf, libgnomecanvas, libgnome, libglade, ORBit2, libart_lgpl}: - -stdenv.mkDerivation { - name = "libbonoboui-2.24.1"; - src = fetchurl { - url = mirror://gnome/platform/2.26/2.26.2/sources/libbonoboui-2.24.1.tar.bz2; - sha256 = "0a8cfll25412bshnnqj1a0dnrcx770jsys4i49zjhw1sqaykc99j"; - }; - buildInputs = [ bison pkgconfig popt gtk libxml2 - intltool libbonobo GConf libgnomecanvas libgnome libglade ]; - - # For some reason GNOME maintainers write crappy automake files and they forget to include - # a lot of required headers (the headers may be found if they are in /usr) - - CPPFLAGS = "-I${cairo}/include/cairo -I${gtk}/include/gtk-2.0 -I${gtk}/lib/gtk-2.0/include " + - "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${atk}/include/atk-1.0 " + - "-I${pango}/include/pango-1.0 -I${libgnome}/include/libgnome-2.0 -I${libbonobo}/include/libbonobo-2.0 "+ - "-I${libbonobo}/include/bonobo-activation-2.0 -I${ORBit2}/include/orbit-2.0 -I${libxml2}/include/libxml2 "+ - "-I${libgnomecanvas}/include/libgnomecanvas-2.0 -I${libart_lgpl}/include/libart-2.0 "+ - "-I${GConf}/include/gconf/2 -I${libglade}/include/libglade-2.0"; - LIBS = "-lgobject-2.0 -lbonobo-2 -lgtk-x11-2.0 -lgconf-2 -lxml2 -lgnome-2 -lgnomecanvas-2"; -} diff --git a/pkgs/desktops/gnome-2.26/platform/libglade/default.nix b/pkgs/desktops/gnome-2.26/platform/libglade/default.nix deleted file mode 100644 index a7fce62eda434..0000000000000 --- a/pkgs/desktops/gnome-2.26/platform/libglade/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchurl, pkgconfig, gtk, libxml2, expat, python, gettext}: - -stdenv.mkDerivation { - name = "libglade-2.6.4"; - src = fetchurl { - url = mirror://gnome/platform/2.26/2.26.2/sources/libglade-2.6.4.tar.bz2; - sha256 = "1v2x2s04jry4gpabws92i0wq2ghd47yr5n9nhgnkd7c38xv1wdk4"; - }; - buildInputs = [ pkgconfig gtk libxml2 expat python gettext ]; -} diff --git a/pkgs/desktops/gnome-2.26/platform/libgnome/default.nix b/pkgs/desktops/gnome-2.26/platform/libgnome/default.nix deleted file mode 100644 index d69a3b992192c..0000000000000 --- a/pkgs/desktops/gnome-2.26/platform/libgnome/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, popt -, intltool, esound, audiofile, libbonobo, GConf, gnome_vfs, ORBit2}: - -stdenv.mkDerivation { - name = "libgnome-2.26.0"; - src = fetchurl { - url = mirror://gnome/platform/2.26/2.26.2/sources/libgnome-2.26.0.tar.bz2; - sha256 = "0673cf0in4p6935nfhs1zhyb2bdjdgwfx2xw41ylmlwzn5x2iw1f"; - }; - buildInputs = [ pkgconfig glib popt intltool esound audiofile libbonobo GConf gnome_vfs ]; - CPPFLAGS = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${ORBit2}/include/orbit-2.0 -I${libbonobo}/include/libbonobo-2.0 -I${libbonobo}/include/bonobo-activation-2.0 -I${GConf}/include/gconf/2 -I${gnome_vfs}/include/gnome-vfs-2.0"; - LIBS = "-lesd -lgconf-2 -lbonobo-activation -lbonobo-2 -lgnomevfs-2"; -} diff --git a/pkgs/desktops/gnome-2.26/platform/libgnomecanvas/default.nix b/pkgs/desktops/gnome-2.26/platform/libgnomecanvas/default.nix deleted file mode 100644 index 13527f7659ea3..0000000000000 --- a/pkgs/desktops/gnome-2.26/platform/libgnomecanvas/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{stdenv, fetchurl, pkgconfig, glib, gtk, pango, atk, cairo, intltool, libart_lgpl, libglade}: - -stdenv.mkDerivation { - name = "libgnomecanvas-2.26.0"; - src = fetchurl { - url = mirror://gnome/platform/2.26/2.26.2/sources/libgnomecanvas-2.26.0.tar.bz2; - sha256 = "13f5rf5pkp9hnyxzvssrxnlykjaixa7vrig9a7v06wrxqfn81d40"; - }; - buildInputs = [ pkgconfig gtk intltool libart_lgpl libglade ]; - CPPFLAGS = "-I${libglade}/include/libglade-2.0 -I${libart_lgpl}/include/libart-2.0 -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${gtk}/include/gtk-2.0 -I${gtk}/lib/gtk-2.0/include -I${atk}/include/atk-1.0 -I${cairo}/include/cairo -I${pango}/include/pango-1.0"; -} diff --git a/pkgs/desktops/gnome-2.26/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2.26/platform/libgnomeui/default.nix deleted file mode 100644 index f592a3c4f6cb6..0000000000000 --- a/pkgs/desktops/gnome-2.26/platform/libgnomeui/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, popt, cairo, libX11, libICE, glib, gtk, atk, pango -, intltool, libgnome, libgnomecanvas, libbonobo, libbonoboui, GConf -, gnome_vfs, gnome_keyring, libglade, libart_lgpl, ORBit2}: - -stdenv.mkDerivation { - name = "libgnomeui-2.24.1"; - src = fetchurl { - url = mirror://gnome/platform/2.26/2.26.2/sources/libgnomeui-2.24.1.tar.bz2; - sha256 = "1hcdiqkvhfrfkyb02zaxrdzhl9h74m79ykfxgpznx59mgfdjivd2"; - }; - buildInputs = [ pkgconfig libxml2 popt libX11 libICE glib gtk pango - intltool libgnome libgnomecanvas libbonoboui GConf gnome_vfs gnome_keyring libglade ]; - CPPFLAGS = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${atk}/include/atk-1.0 "+ - "-I${gtk}/include/gtk-2.0 -I${gtk}/lib/gtk-2.0/include -I${libbonoboui}/include/libbonoboui-2.0 "+ - "-I${cairo}/include/cairo -I${pango}/include/pango-1.0 -I${libgnomecanvas}/include/libgnomecanvas-2.0 "+ - "-I${libgnome}/include/libgnome-2.0 -I${libart_lgpl}/include/libart-2.0 -I${gnome_vfs}/include/gnome-vfs-2.0 "+ - "-I${libbonobo}/include/libbonobo-2.0 -I${GConf}/include/gconf/2 -I${libxml2}/include/libxml2 "+ - "-I${libbonobo}/include/bonobo-activation-2.0 -I${ORBit2}/include/orbit-2.0 "+ - "-I${gnome_keyring}/include/gnome-keyring-1 -I${libglade}/include/libglade-2.0"; - LIBS = "-lgtk-x11-2.0 -lgnomecanvas-2 -lgconf-2 -lbonoboui-2 -lgnome-keyring"; -} diff --git a/pkgs/desktops/gnome-2.26/platform/libunique/default.nix b/pkgs/desktops/gnome-2.26/platform/libunique/default.nix deleted file mode 100644 index 870e1763bbc44..0000000000000 --- a/pkgs/desktops/gnome-2.26/platform/libunique/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchurl, pkgconfig, gettext, gtk}: - -stdenv.mkDerivation { - name = "libunique-1.0.8"; - src = fetchurl { - url = mirror://gnome/sources/libunique/1.0/libunique-1.0.8.tar.bz2; - sha256 = "1iplvmc41h64kdrsgpvb03mawzvflarvlpk5mng4xw9sa87s29yn"; - }; - buildInputs = [ pkgconfig gettext gtk ]; -} diff --git a/pkgs/desktops/gnome-2.26/platform/startup-notification/default.nix b/pkgs/desktops/gnome-2.26/platform/startup-notification/default.nix deleted file mode 100644 index 0737ed6ba42a2..0000000000000 --- a/pkgs/desktops/gnome-2.26/platform/startup-notification/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchurl, pkgconfig, libX11, libxcb, libICE, xcbutil, libSM}: - -stdenv.mkDerivation { - name = "startup-notification-0.10"; - src = fetchurl { - url = http://freedesktop.org/software/startup-notification/releases/startup-notification-0.10.tar.gz; - sha256 = "0nalaay0yj3gq85insp9l31hsv5zp390m4nn37y235v151ffpfv4"; - }; - buildInputs = [ pkgconfig libX11 libxcb libICE xcbutil libSM ]; -} diff --git a/pkgs/desktops/gnome-2.28/bindings/libglademm/default.nix b/pkgs/desktops/gnome-2.28/bindings/libglademm/default.nix new file mode 100644 index 0000000000000..c140eb944c6c6 --- /dev/null +++ b/pkgs/desktops/gnome-2.28/bindings/libglademm/default.nix @@ -0,0 +1,14 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtkmm, libglade }: + +stdenv.mkDerivation rec { + name = "libglademm-2.6.7"; + + src = fetchurl { + url = "mirror://gnome/sources/libglademm/2.6/${name}.tar.bz2"; + sha256 = "1hrbg9l5qb7w0xvr7013qamkckyj0fqc426c851l69zpmhakqm1q"; + }; + + buildInputs = [ pkgconfig intltool ]; + + propagatedBuildInputs = [ gtkmm libglade ]; +} diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index 83bda71dc4bcf..c0e68fd9b5478 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -1,7 +1,24 @@ pkgs: rec { + + inherit (pkgs.gtkLibs) glib pango atk gtk gtkmm; + + # Backward compatibility. + gnomevfs = gnome_vfs; + startupnotification = startup_notification; + gnomedocutils = gnome_doc_utils; + gnomeicontheme = gnome_icon_theme; + + # !!! Missing! Need to add these. + libgnomeprint = throw "libgnomeprint not implemented"; + libgtkhtml = throw "libgtkhtml not implemented"; + vte = throw "vte not implemented"; + gtksourceview_24 = gtksourceview; + + #### PLATFORM + audiofile = import ./platform/audiofile { inherit (pkgs) stdenv fetchurl; }; @@ -27,7 +44,7 @@ rec { }; libglade = import ./platform/libglade { - inherit (pkgs) stdenv fetchurl pkgconfig libxml2 expat python gettext; + inherit (pkgs) stdenv fetchurl pkgconfig libxml2 python gettext; inherit (pkgs.gtkLibs) gtk; }; @@ -36,15 +53,15 @@ rec { }; GConf = import ./platform/GConf { - inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxml2 expat policykit; - inherit (pkgs.gtkLibs) glib gtk; + inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxml2 policykit; + inherit (pkgs.gtkLibs) glib; inherit intltool ORBit2; dbus_libs = pkgs.dbus.libs; }; libgnomecanvas = import ./platform/libgnomecanvas { - inherit (pkgs) stdenv fetchurl pkgconfig cairo; - inherit (pkgs.gtkLibs) glib gtk pango atk; + inherit (pkgs) stdenv fetchurl pkgconfig; + inherit (pkgs.gtkLibs) gtk; inherit intltool libart_lgpl libglade; }; @@ -72,17 +89,15 @@ rec { }; libgnome = import ./platform/libgnome { - inherit (pkgs) stdenv fetchurl pkgconfig popt; + inherit (pkgs) stdenv fetchurl pkgconfig popt zlib; inherit (pkgs.gtkLibs) glib; - inherit intltool esound audiofile libbonobo GConf gnome_vfs ORBit2; + inherit intltool esound libbonobo GConf gnome_vfs ORBit2; }; libgnomeui = import ./platform/libgnomeui { - inherit (pkgs) stdenv fetchurl pkgconfig libxml2 popt cairo; - inherit (pkgs.xlibs) libX11 libICE; - inherit (pkgs.gtkLibs) glib gtk atk pango; - inherit intltool libgnome libgnomecanvas libbonobo libbonoboui GConf; - inherit gnome_vfs gnome_keyring libglade libart_lgpl ORBit2; + inherit (pkgs) stdenv fetchurl pkgconfig libxml2 xlibs; + inherit intltool libgnome libgnomecanvas libbonoboui GConf; + inherit gnome_vfs gnome_keyring libglade glib pango; }; libbonobo = import ./platform/libbonobo { @@ -92,9 +107,8 @@ rec { }; libbonoboui = import ./platform/libbonoboui { - inherit (pkgs) stdenv fetchurl bison pkgconfig popt libxml2 cairo; - inherit (pkgs.gtkLibs) glib gtk atk pango; - inherit intltool libbonobo GConf libgnomecanvas libgnome libglade ORBit2 libart_lgpl; + inherit (pkgs) stdenv fetchurl bison pkgconfig popt libxml2; + inherit intltool libbonobo GConf libgnomecanvas libgnome libglade gtk; }; at_spi = import ./platform/at-spi { @@ -115,8 +129,7 @@ rec { # Freedesktop library startup_notification = import ./platform/startup-notification { - inherit (pkgs) stdenv fetchurl pkgconfig; - inherit (pkgs.xlibs) libX11 libxcb libICE xcbutil libSM; + inherit (pkgs) stdenv fetchurl pkgconfig xlibs; }; # Required for nautilus @@ -125,6 +138,11 @@ rec { inherit (pkgs.gtkLibs) gtk; }; + gtkglext = import ./platform/gtkglext { + inherit (pkgs) stdenv fetchurl mesa pkgconfig; + inherit (pkgs.gtkLibs) gtk pango; + }; + #### DESKTOP gnome_keyring = import ./desktop/gnome-keyring { @@ -260,8 +278,15 @@ rec { inherit gnome_desktop libunique intltool GConf; }; - gtkglext = import ./platform/gtkglext { - inherit (pkgs) stdenv fetchurl mesa pkgconfig; - inherit (pkgs.gtkLibs) gtk pango; + gnome_icon_theme = import ./desktop/gnome-icon-theme { + inherit (pkgs) stdenv fetchurl pkgconfig intltool iconnamingutils; + }; + +#### BINDINGS + + libglademm = import ./bindings/libglademm { + inherit (pkgs) stdenv fetchurl pkgconfig intltool; + inherit gtkmm libglade; }; + } diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-2.28/desktop/gnome-icon-theme/default.nix new file mode 100644 index 0000000000000..22aeb8a0f59f5 --- /dev/null +++ b/pkgs/desktops/gnome-2.28/desktop/gnome-icon-theme/default.nix @@ -0,0 +1,12 @@ +{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils }: + +stdenv.mkDerivation rec { + name = "gnome-icon-theme-2.28.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-icon-theme/2.28/${name}.tar.bz2"; + sha256 = "111q1yijm8mjvz600nfa49gbjz4988vpfv74jcknfng0k92vvv1i"; + }; + + buildInputs = [ pkgconfig intltool iconnamingutils ]; +} diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix b/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix index 8186c5adec224..fdb885bf595c5 100644 --- a/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix @@ -2,9 +2,13 @@ stdenv.mkDerivation { name = "gnome-keyring-2.28.0"; + src = fetchurl { url = mirror://gnome/sources/gnome-keyring/2.28/gnome-keyring-2.28.0.tar.bz2; sha256 = "1d6av3cq32ypq9f9mv7f9bcqkkdqgbvbb831kad62smczvqk8chv"; }; - buildInputs = [ pkgconfig dbus.libs libgcrypt libtasn1 pam hal python glib gtk intltool GConf ]; + + buildInputs = [ pkgconfig dbus.libs libgcrypt pam hal python gtk intltool GConf ]; + + propagatedBuildInputs = [ glib libtasn1 ]; } diff --git a/pkgs/desktops/gnome-2.28/platform/GConf/default.nix b/pkgs/desktops/gnome-2.28/platform/GConf/default.nix index 661a20e2b6591..1b3af898f6eb4 100644 --- a/pkgs/desktops/gnome-2.28/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/GConf/default.nix @@ -1,18 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, glib, gtk, ORBit2, libxml2 -, expat, policykit, intltool, dbus_libs}: +{ stdenv, fetchurl, pkgconfig, dbus_glib, glib, ORBit2, libxml2 +, policykit, intltool, dbus_libs }: stdenv.mkDerivation { name = "GConf-2.26.2"; + src = fetchurl { url = mirror://gnome/platform/2.26/2.26.2/sources/GConf-2.26.2.tar.bz2; sha256 = "1vb7hjxddy54g4vch936621g66n0mhi3wkhm9lwqh449vdqg4yki"; }; - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${dbus_glib}/include/dbus-1.0 -I${policykit}/include/PolicyKit -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${dbus_libs}/include/dbus-1.0 -I${dbus_libs}/lib/dbus-1.0/include" - export NIX_LDFLAGS="$NIX_LDFLAGS $(glib-config --libs)" - ''; - - buildInputs = [ pkgconfig glib gtk dbus_glib ORBit2 libxml2 - expat policykit intltool dbus_libs]; + buildInputs = [ pkgconfig ORBit2 dbus_libs dbus_glib libxml2 policykit intltool ]; + propagatedBuildInputs = [ glib ]; } diff --git a/pkgs/desktops/gnome-2.28/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2.28/platform/ORBit2/default.nix index 42db2b450713f..0d536e830b1f8 100644 --- a/pkgs/desktops/gnome-2.28/platform/ORBit2/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/ORBit2/default.nix @@ -2,9 +2,12 @@ stdenv.mkDerivation { name = "ORBit2-2.14.17"; + src = fetchurl { url = mirror://gnome/sources/ORBit2/2.14/ORBit2-2.14.17.tar.bz2; sha256 = "0k4px2f949ac7vmj7b155g1rpf7pmvl48sbnkjhlg4wgcwzwxgv2"; }; - buildInputs = [ pkgconfig glib libIDL ]; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ glib libIDL ]; } diff --git a/pkgs/desktops/gnome-2.28/platform/esound/default.nix b/pkgs/desktops/gnome-2.28/platform/esound/default.nix index 45dd6655a4545..e273251bfa587 100644 --- a/pkgs/desktops/gnome-2.28/platform/esound/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/esound/default.nix @@ -2,9 +2,12 @@ stdenv.mkDerivation { name = "esound-0.2.41"; + src = fetchurl { url = mirror://gnome/sources/esound/0.2/esound-0.2.41.tar.bz2; sha256 = "04a9ldy7hsvry1xmfhzg5is2dabsp8m6a82vkai64d2blqlxvday"; }; - buildInputs = [ pkgconfig alsaLib audiofile ]; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ alsaLib audiofile ]; } diff --git a/pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix index 2a7044c5a2071..4772e2ded9e75 100644 --- a/pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix @@ -3,10 +3,16 @@ stdenv.mkDerivation { name = "gnome-vfs-2.24.1"; + src = fetchurl { url = mirror://gnome/sources/gnome-vfs/2.24/gnome-vfs-2.24.1.tar.bz2; sha256 = "1dmyr8nj77717r8dhwkixpar2yp8ld3r683gp222n59v61718ndw"; }; - buildInputs = [ pkgconfig libxml2 bzip2 openssl samba dbus_glib glib fam hal cdparanoia - intltool GConf gnome_mime_data ]; + + buildInputs = + [ pkgconfig libxml2 bzip2 openssl samba dbus_glib fam hal cdparanoia + intltool gnome_mime_data + ]; + + propagatedBuildInputs = [ GConf glib ]; } diff --git a/pkgs/desktops/gnome-2.28/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2.28/platform/libbonobo/default.nix index b72ecc212287f..9910965cf9178 100644 --- a/pkgs/desktops/gnome-2.28/platform/libbonobo/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/libbonobo/default.nix @@ -2,9 +2,12 @@ stdenv.mkDerivation { name = "libbonobo-2.24.2"; + src = fetchurl { url = mirror://gnome/sources/libbonobo/2.24/libbonobo-2.24.2.tar.bz2; sha256 = "1gr85amd271z0lbr68crcsc24rx1pa5k20f67y3y2mx664527h4m"; }; - buildInputs = [ flex bison pkgconfig glib dbus_glib libxml2 popt intltool ORBit2 ]; + + buildInputs = [ flex bison pkgconfig dbus_glib libxml2 intltool ]; + propagatedBuildInputs = [ popt glib ORBit2 ]; } diff --git a/pkgs/desktops/gnome-2.28/platform/libbonoboui/default.nix b/pkgs/desktops/gnome-2.28/platform/libbonoboui/default.nix index 3e067b90adcae..20169161b82af 100644 --- a/pkgs/desktops/gnome-2.28/platform/libbonoboui/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/libbonoboui/default.nix @@ -1,23 +1,14 @@ -{ stdenv, fetchurl, bison, pkgconfig, popt, libxml2, cairo, glib, gtk, atk, pango -, intltool, libbonobo, GConf, libgnomecanvas, libgnome, libglade, ORBit2, libart_lgpl}: +{ stdenv, fetchurl, bison, pkgconfig, popt, libxml2, gtk +, intltool, libbonobo, GConf, libgnomecanvas, libgnome, libglade }: stdenv.mkDerivation { name = "libbonoboui-2.24.2"; + src = fetchurl { url = mirror://gnome/sources/libbonoboui/2.24/libbonoboui-2.24.2.tar.bz2; sha256 = "005ypnzb3mfsb0k0aa3h77vwc4ifjq6r4d11msqllvx7avfgkg5f"; }; - buildInputs = [ bison pkgconfig popt gtk libxml2 - intltool libbonobo GConf libgnomecanvas libgnome libglade ]; - - # For some reason GNOME maintainers write crappy automake files and they forget to include - # a lot of required headers (the headers may be found if they are in /usr) - CPPFLAGS = "-I${cairo}/include/cairo -I${gtk}/include/gtk-2.0 -I${gtk}/lib/gtk-2.0/include " + - "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${atk}/include/atk-1.0 " + - "-I${pango}/include/pango-1.0 -I${libgnome}/include/libgnome-2.0 -I${libbonobo}/include/libbonobo-2.0 "+ - "-I${libbonobo}/include/bonobo-activation-2.0 -I${ORBit2}/include/orbit-2.0 -I${libxml2}/include/libxml2 "+ - "-I${libgnomecanvas}/include/libgnomecanvas-2.0 -I${libart_lgpl}/include/libart-2.0 "+ - "-I${GConf}/include/gconf/2 -I${libglade}/include/libglade-2.0"; - LIBS = "-lgobject-2.0 -lbonobo-2 -lgtk-x11-2.0 -lgconf-2 -lxml2 -lgnome-2 -lgnomecanvas-2"; + buildInputs = [ bison pkgconfig popt gtk libxml2 intltool GConf libglade ]; + propagatedBuildInputs = [ libbonobo libgnomecanvas libgnome ]; } diff --git a/pkgs/desktops/gnome-2.28/platform/libglade/default.nix b/pkgs/desktops/gnome-2.28/platform/libglade/default.nix index 70287bf0eb150..93490007692a7 100644 --- a/pkgs/desktops/gnome-2.28/platform/libglade/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/libglade/default.nix @@ -1,10 +1,14 @@ -{stdenv, fetchurl, pkgconfig, gtk, libxml2, expat, python, gettext}: +{stdenv, fetchurl, pkgconfig, gtk, libxml2, python, gettext}: stdenv.mkDerivation { name = "libglade-2.6.4"; + src = fetchurl { url = mirror://gnome/sources/libglade/2.6/libglade-2.6.4.tar.bz2; sha256 = "1v2x2s04jry4gpabws92i0wq2ghd47yr5n9nhgnkd7c38xv1wdk4"; }; - buildInputs = [ pkgconfig gtk libxml2 expat python gettext ]; + + buildInputs = [ pkgconfig gtk python gettext ]; + + propagatedBuildInputs = [ libxml2 ]; } diff --git a/pkgs/desktops/gnome-2.28/platform/libgnome/default.nix b/pkgs/desktops/gnome-2.28/platform/libgnome/default.nix index ba403cf5adb98..c79a61b883a32 100644 --- a/pkgs/desktops/gnome-2.28/platform/libgnome/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/libgnome/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, glib, popt -, intltool, esound, audiofile, libbonobo, GConf, gnome_vfs, ORBit2}: +{ stdenv, fetchurl, pkgconfig, glib, popt, zlib +, intltool, esound, libbonobo, GConf, gnome_vfs, ORBit2}: stdenv.mkDerivation { name = "libgnome-2.28.0"; + src = fetchurl { url = mirror://gnome/sources/libgnome/2.28/libgnome-2.28.0.tar.bz2; sha256 = "03hc1m88swxxw4cq491kz7495ksv762imamzbbvhci41bc40anwv"; }; - buildInputs = [ pkgconfig glib popt intltool esound audiofile libbonobo GConf gnome_vfs ]; - CPPFLAGS = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${ORBit2}/include/orbit-2.0 -I${libbonobo}/include/libbonobo-2.0 -I${libbonobo}/include/bonobo-activation-2.0 -I${GConf}/include/gconf/2 -I${gnome_vfs}/include/gnome-vfs-2.0"; - LIBS = "-lesd -lgconf-2 -lbonobo-activation -lbonobo-2 -lgnomevfs-2"; + + buildInputs = [ pkgconfig popt zlib intltool GConf gnome_vfs ]; + propagatedBuildInputs = [ glib libbonobo esound ]; } diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomecanvas/default.nix b/pkgs/desktops/gnome-2.28/platform/libgnomecanvas/default.nix index 12c31c0382eed..95f484ff7a401 100644 --- a/pkgs/desktops/gnome-2.28/platform/libgnomecanvas/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/libgnomecanvas/default.nix @@ -1,11 +1,14 @@ -{stdenv, fetchurl, pkgconfig, glib, gtk, pango, atk, cairo, intltool, libart_lgpl, libglade}: +{ stdenv, fetchurl, pkgconfig, gtk, intltool, libart_lgpl, libglade }: stdenv.mkDerivation { name = "libgnomecanvas-2.26.0"; + src = fetchurl { url = mirror://gnome/sources/libgnomecanvas/2.26/libgnomecanvas-2.26.0.tar.bz2; sha256 = "13f5rf5pkp9hnyxzvssrxnlykjaixa7vrig9a7v06wrxqfn81d40"; }; - buildInputs = [ pkgconfig gtk intltool libart_lgpl libglade ]; - CPPFLAGS = "-I${libglade}/include/libglade-2.0 -I${libart_lgpl}/include/libart-2.0 -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${gtk}/include/gtk-2.0 -I${gtk}/lib/gtk-2.0/include -I${atk}/include/atk-1.0 -I${cairo}/include/cairo -I${pango}/include/pango-1.0"; + + buildInputs = [ pkgconfig intltool libglade ]; + + propagatedBuildInputs = [ libart_lgpl gtk ]; } diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2.28/platform/libgnomeui/default.nix index 822e14bbd7e84..d3edee3ffd3d3 100644 --- a/pkgs/desktops/gnome-2.28/platform/libgnomeui/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/libgnomeui/default.nix @@ -1,21 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, popt, cairo, libX11, libICE, glib, gtk, atk, pango -, intltool, libgnome, libgnomecanvas, libbonobo, libbonoboui, GConf -, gnome_vfs, gnome_keyring, libglade, libart_lgpl, ORBit2}: +{ stdenv, fetchurl, pkgconfig, libxml2, xlibs, glib, pango +, intltool, libgnome, libgnomecanvas, libbonoboui, GConf +, gnome_vfs, gnome_keyring, libglade }: stdenv.mkDerivation { name = "libgnomeui-2.24.2"; + src = fetchurl { url = mirror://gnome/sources/libgnomeui/2.24/libgnomeui-2.24.2.tar.bz2; sha256 = "04296nf6agg8zsbw6pzl3mzn890bkcczs6fnna5jay7fvnrmjx5f"; }; - buildInputs = [ pkgconfig libxml2 popt libX11 libICE glib gtk pango - intltool libgnome libgnomecanvas libbonoboui GConf gnome_vfs gnome_keyring libglade ]; - CPPFLAGS = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${atk}/include/atk-1.0 "+ - "-I${gtk}/include/gtk-2.0 -I${gtk}/lib/gtk-2.0/include -I${libbonoboui}/include/libbonoboui-2.0 "+ - "-I${cairo}/include/cairo -I${pango}/include/pango-1.0 -I${libgnomecanvas}/include/libgnomecanvas-2.0 "+ - "-I${libgnome}/include/libgnome-2.0 -I${libart_lgpl}/include/libart-2.0 -I${gnome_vfs}/include/gnome-vfs-2.0 "+ - "-I${libbonobo}/include/libbonobo-2.0 -I${GConf}/include/gconf/2 -I${libxml2}/include/libxml2 "+ - "-I${libbonobo}/include/bonobo-activation-2.0 -I${ORBit2}/include/orbit-2.0 "+ - "-I${gnome_keyring}/include/gnome-keyring-1 -I${libglade}/include/libglade-2.0"; - LIBS = "-lgtk-x11-2.0 -lgnomecanvas-2 -lgconf-2 -lbonoboui-2 -lgnome-keyring"; + + buildInputs = [ pkgconfig intltool xlibs.xlibs libxml2 GConf pango glib gnome_keyring libglade ]; + + propagatedBuildInputs = [ libgnome libbonoboui libgnomecanvas gnome_vfs ]; } diff --git a/pkgs/desktops/gnome-2.28/platform/startup-notification/default.nix b/pkgs/desktops/gnome-2.28/platform/startup-notification/default.nix index b54f13a39b22a..b82b8a50992af 100644 --- a/pkgs/desktops/gnome-2.28/platform/startup-notification/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/startup-notification/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, libX11, libxcb, libICE, xcbutil, libSM}: +{ stdenv, fetchurl, pkgconfig, xlibs }: stdenv.mkDerivation { name = "startup-notification-0.9"; @@ -6,5 +6,5 @@ stdenv.mkDerivation { url = mirror://gnome/sources/startup-notification/0.9/startup-notification-0.9.tar.bz2; sha256 = "03aqkgv8d29yx2vmv6bfdlxq3ahagrb7dbsvhd5d9acy6znimpk1"; }; - buildInputs = [ pkgconfig libX11 libxcb libICE xcbutil libSM ]; + buildInputs = [ pkgconfig xlibs.xlibs xlibs.xcbutil ]; } diff --git a/pkgs/desktops/gnome/ORBit2.nix b/pkgs/desktops/gnome/ORBit2.nix deleted file mode 100644 index 69f62fb79a68f..0000000000000 --- a/pkgs/desktops/gnome/ORBit2.nix +++ /dev/null @@ -1,10 +0,0 @@ -{input, stdenv, fetchurl, pkgconfig, glib, libIDL, popt}: - -assert pkgconfig != null && glib != null && libIDL != null - && popt != null; - -stdenv.mkDerivation { - inherit (input) name src; - buildInputs = [pkgconfig libIDL popt]; - propagatedBuildInputs = [glib]; -} diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix deleted file mode 100644 index 3d6858dfffba3..0000000000000 --- a/pkgs/desktops/gnome/default.nix +++ /dev/null @@ -1,392 +0,0 @@ -args: with args; - -#assert dbus_glib.glib == gtkLibs.glib; - -let gnome = - -rec { - - # Platform - - platform = import ./src-gnome-platform-2.26.0.nix { - inherit fetchurl; - }; - - glib = gtkLibs.glib; - - atk = gtkLibs.atk; - - pango = gtkLibs.pango; - - gtk = gtkLibs.gtk; - - audiofile = stdenv.mkDerivation { - inherit (platform.audiofile) name src; - }; - - esound = stdenv.mkDerivation { - inherit (platform.esound) name src; - propagatedBuildInputs = [pkgconfig audiofile]; - }; - - libIDL = import ./libIDL.nix { - inherit fetchurl stdenv pkgconfig glib; - input = platform.libIDL; - lex = flex; - yacc = bison; - }; - - ORBit2 = import ./ORBit2.nix { - inherit fetchurl stdenv pkgconfig glib libIDL popt; - input = platform.ORBit2; - }; - - GConf = stdenv.mkDerivation { - inherit (platform.GConf) name src; - buildInputs = [ - pkgconfig perl glib gtk libxml2 - dbus dbus_glib - popt gettext perlXMLParser intltool - ]; - propagatedBuildInputs = [ORBit2]; - }; - - gnomemimedata = import ./gnome-mime-data.nix { - inherit fetchurl stdenv pkgconfig perl perlXMLParser gettext; - input = platform.gnomemimedata; - }; - - gnomevfs = stdenv.mkDerivation { - inherit (platform.gnomevfs) name src; - buildInputs = [ - pkgconfig perl glib libxml2 libbonobo - gnomemimedata popt perlXMLParser gettext intltool bzip2 - dbus_glib hal openssl samba fam - ]; - propagatedBuildInputs = [GConf]; - patches = [./no-kerberos.patch]; - }; - - gail = stdenv.mkDerivation { - name = "gail-1.22.3"; - src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/gail/1.22/gail-1.22.3.tar.bz2"; - sha256 = "1s4s0ndjh42i8x2mchz0xm3qcp942vkmz0jsq7ig1d3y4wlk1w03"; - }; - buildInputs = [pkgconfig atk gtk]; - }; - - libgnome = import ./libgnome.nix { - inherit fetchurl stdenv gnome pkgconfig perl perlXMLParser - popt zlib esound gettext intltool; - input = platform.libgnome; - }; - - libart_lgpl = import ./libart_lgpl.nix { - inherit fetchurl stdenv; - input = platform.libart_lgpl; - }; - - libglade = import ./libglade.nix { - inherit fetchurl stdenv pkgconfig gtk libxml2; - input = platform.libglade; - }; - - libglademm = import ./libglademm.nix { - inherit fetchurl stdenv pkgconfig libglade; - inherit (gtkLibs) gtkmm; - }; - - libgnomecanvas = stdenv.mkDerivation { - inherit (platform.libgnomecanvas) name src; - buildInputs = [ - pkgconfig libglade perl perlXMLParser gail - gettext intltool - ]; - propagatedBuildInputs = [gtk libart_lgpl]; - }; - - libbonobo = import ./libbonobo.nix { - inherit fetchurl stdenv pkgconfig perl perlXMLParser ORBit2 - dbus dbus_glib libxml2 popt flex - gettext intltool; - yacc = bison; - input = platform.libbonobo; - }; - - libbonoboui = import ./libbonoboui.nix { - inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 libglade - libgnome libgnomecanvas gettext intltool; - input = platform.libbonoboui; - }; - - libgnomeui = import ./libgnomeui.nix { - inherit fetchurl stdenv gnome pkgconfig perl perlXMLParser - libjpeg esound gettext intltool; - input = platform.libgnomeui; - }; - - intltool = import ./intltool.nix { - inherit fetchurl stdenv pkgconfig perl perlXMLParser; - }; - - - # Desktop - - desktop = import ./src-gnome-desktop-2.26.0.nix { - inherit fetchurl; - }; - - libgnomeprint = stdenv.mkDerivation { - inherit (desktop.libgnomeprint) name src; - - buildInputs = [ - perl perlXMLParser pkgconfig popt libxml2 - glib pango bison flex gettext intltool - ]; - - propagatedBuildInputs = [libxml2 libart_lgpl]; - }; - - libgnomeprintui = stdenv.mkDerivation { - inherit (desktop.libgnomeprintui) name src; - - buildInputs = [ - perl perlXMLParser pkgconfig gtk libgnomecanvas gnomeicontheme - gettext intltool - ]; - - propagatedBuildInputs = [ - libgnomeprint - ]; - }; - - gtkhtml = import ./gtkhtml.nix { - inherit fetchurl stdenv pkgconfig perl perlXMLParser libjpeg gettext intltool enchant isocodes; - inherit gtk atk gail libgnomeprint libgnomeprintui libgnomeui libglade gnomeicontheme; - input = desktop.gtkhtml; - }; - - libgtkhtml = gtkhtml; - - gnomeicontheme = import ./gnome-icon-theme.nix { - inherit fetchurl stdenv pkgconfig perl perlXMLParser - iconnamingutils gettext; - inherit (args) intltool; - input = desktop.gnomeicontheme; - }; - - gnomekeyring = stdenv.mkDerivation { - inherit (desktop.gnomekeyring) name src; - buildInputs = [ - pkgconfig gtk glib perl perlXMLParser gettext intltool - GConf libgcrypt libtasn1 dbus dbus_glib python - ]; - CFLAGS = "-DENABLE_NLS=0"; - }; - - gtksourceview = import ./gtksourceview.nix { - inherit fetchurl stdenv pkgconfig perl perlXMLParser gtk libxml2 gettext - libgnomeprint gnomevfs libbonobo /* !!! <- should be propagated in gnomevfs */ - GConf /* idem */ libgnomeprintui libgnomecanvas /* !!! through printui */ - intltool; - input = desktop.gtksourceview; - }; - - gtksourceview_24 = stdenv.mkDerivation { - name = "gtksourceview-2.4.2"; - - src = fetchurl { - url = http://ftp.gnome.org/pub/gnome/sources/gtksourceview/2.4/gtksourceview-2.4.2.tar.bz2; - sha256 = "1grc2y817c0xd225l0m92ja35x2bgld5npa4w3g21amkqhdnpka9"; - }; - - buildInputs = [ - perl perlXMLParser pkgconfig gnomevfs libbonobo GConf - libgnomeprintui libgnomecanvas gettext intltool - ]; - propagatedBuildInputs = [gtk libxml2 libgnomeprint]; - }; - - scrollkeeper = import ./scrollkeeper.nix { - inherit fetchurl stdenv pkgconfig perl perlXMLParser - libxml2 libxslt docbook_xml_dtd_42; - # Scrollkeeper has disappeared from recent Gnome releases, but - # it's still being used. - input = { - name = "scrollkeeper-0.3.14"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/scrollkeeper-0.3.14.tar.bz2; - md5 = "b175e582a6cec3e50a9de73a5bb7455a"; - }; - }; - }; - - gnomedesktop = stdenv.mkDerivation { - inherit (desktop.gnomedesktop) name src; - - # !!! should get rid of libxml2Python, see gnomedocutils - - buildInputs = [ - pkgconfig perl perlXMLParser gtk glib libgnomeui - scrollkeeper libjpeg gnomedocutils gettext which - python libxml2Python libxslt intltool - ]; - - configureFlags = "--disable-scrollkeeper"; - }; - - libwnck = stdenv.mkDerivation { - inherit (desktop.libwnck) name src; - buildInputs = [pkgconfig gtk perl perlXMLParser gettext intltool]; - }; - - gnomemenus = stdenv.mkDerivation { - inherit (desktop.gnomemenus) name src; - buildInputs = [ - pkgconfig perl perlXMLParser glib python gettext intltool - ]; - }; - - librsvg = stdenv.mkDerivation { - inherit (desktop.librsvg) name src; - buildInputs = [libxml2 libart_lgpl pkgconfig glib pkgconfig pango gtk]; - }; - - libgweather = stdenv.mkDerivation { - inherit (desktop.libgweather) name src; - configureFlags = "--with-zoneinfo-dir=/etc/localtime"; # is created by nixos. This is the default location of debian/ gentoo as well - buildInputs = [ - gettext perl perlXMLParser pkgconfig gtk libxml2 gnomevfs - intltool libsoup - ]; - }; - - gnomepanel = stdenv.mkDerivation { - inherit (desktop.gnomepanel) name src; - - buildInputs = [ - pkgconfig perl perlXMLParser gtk glib ORBit2 libgnome libgnomeui - gnomedesktop libglade libwnck libjpeg libpng scrollkeeper - xlibs.libXmu xlibs.libXau dbus_glib gnomemenus gnomedocutils - gettext libxslt librsvg libgweather which intltool - ]; - - configureFlags = "--disable-scrollkeeper"; - }; - - libsoup = import ./libsoup.nix { - inherit stdenv fetchurl pkgconfig libxml2 glib - libproxy GConf sqlite; - input = desktop.libsoup; - }; - - startupnotification = import ./startup-notification.nix { - inherit stdenv fetchurl pkgconfig x11; - # Strangely, startup-notificatio has disappeared from Gnome - # releases, but it's still used. - input = { - name = "startup-notification-0.8"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/startup-notification-0.8.tar.bz2; - md5 = "d9b2e9fba18843314ae42334ceb4336d"; - }; - }; - }; - - metacity = import ./metacity.nix { - inherit stdenv fetchurl pkgconfig perl perlXMLParser glib gtk - GConf startupnotification gettext libcm intltool zenity gnomedocutils; - inherit (xlibs) libXinerama libXrandr libXcursor - libXcomposite libXfixes libXdamage; - enableCompositor = true; - input = desktop.metacity; - }; - - zenity = stdenv.mkDerivation { - inherit (desktop.zenity) name src; - - buildInputs = [ - pkgconfig glib gtk - gettext intltool gnomedocutils libglade - libxslt - xlibs.libX11 - ]; - - preConfigure = ''export NIX_LDFLAGS="$NIX_LDFLAGS -lX11";''; - configureFlags = "--disable-scrollkeeper"; - }; - - gnomedocutils = import ./gnome-doc-utils.nix { - inherit stdenv fetchurl pkgconfig perl perlXMLParser python - libxml2 libxslt gettext libxml2Python; - input = desktop.gnomedocutils; - }; - - gconfeditor = stdenv.mkDerivation { - inherit (desktop.gconfeditor) name src; - - buildInputs = [ - pkgconfig perl perlXMLParser GConf gnomedocutils - gtk libgnome libgnomeui gettext libxslt intltool - polkit dbus_glib - ]; - - configureFlags = "--disable-scrollkeeper"; - }; - - vte = stdenv.mkDerivation { - inherit (desktop.vte) name src; - - buildInputs = [ - pkgconfig perl perlXMLParser glib gtk python gettext intltool - ]; - - propagatedBuildInputs = [ncurses]; - }; - - gnometerminal = stdenv.mkDerivation { - inherit (desktop.gnometerminal) name src; - - buildInputs = [ - pkgconfig perl perlXMLParser gtk GConf libglade libgnomeui - startupnotification gnomevfs vte gnomedocutils gettext which - scrollkeeper python libxml2Python libxslt intltool - dbus_glib - ]; - - configureFlags = "--disable-scrollkeeper"; - }; - - libgtop = stdenv.mkDerivation { - inherit (desktop.libgtop) name src; - - buildInputs = [ - pkgconfig perl perlXMLParser glib popt gettext intltool - ]; - }; - - gnomeutils = stdenv.mkDerivation { - inherit (desktop.gnomeutils) name src; - - buildInputs = [ - pkgconfig perl perlXMLParser glib gtk libgnome libgnomeui - libglade libgnomeprintui gnomedesktop gnomepanel libgtop - scrollkeeper gnomedocutils gettext libxslt xlibs.libXmu intltool - which - ]; - - configureFlags = "--disable-scrollkeeper"; - }; - - gtkdoc = import ./gtkdoc.nix { - inherit (platform) gtkdoc; - inherit stdenv pkgconfig gnomedocutils perl python libxml2 - xmlto docbook2x docbook_xsl docbook_xml_dtd_43 libxslt - scrollkeeper; - }; - -}; - -in gnome - diff --git a/pkgs/desktops/gnome/gnome-doc-utils.nix b/pkgs/desktops/gnome/gnome-doc-utils.nix deleted file mode 100644 index 8a77d96475f35..0000000000000 --- a/pkgs/desktops/gnome/gnome-doc-utils.nix +++ /dev/null @@ -1,23 +0,0 @@ -args: with args; -# !!! xml2po needs to store the path to libxml2 - -stdenv.mkDerivation { - inherit (input) name src; - - buildInputs = [ - pkgconfig perl perlXMLParser python - libxml2 libxslt gettext python libxml2Python - ]; - - configureFlags = "--disable-scrollkeeper"; - - postInstall = " - mv \$out/bin/xml2po \$out/bin/.xml2po.orig - pythonPathLibXml2=\"\$(toPythonPath ${libxml2Python})\" - echo -e '#! ${stdenv.shell}\nPYTHONPATH=$PYTHONPATH:'\"\$( toPythonPath \$out )"+ - ":\${pythonPathLibXml2//python2.5/python2.4}"+ - ":\$( toPythonPath ${libxml2Python} )\""+ - "' \$(dirname \$0)/.xml2po.orig \"\$@\"' > \$out/bin/xml2po; - chmod a+x \$out/bin/xml2po - "; -} diff --git a/pkgs/desktops/gnome/gnome-icon-theme.nix b/pkgs/desktops/gnome/gnome-icon-theme.nix deleted file mode 100644 index fbfe154401efa..0000000000000 --- a/pkgs/desktops/gnome/gnome-icon-theme.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser -, iconnamingutils, gettext, intltool -}: - -stdenv.mkDerivation { - inherit (input) name src; - buildInputs = [intltool pkgconfig perl perlXMLParser iconnamingutils gettext ]; - - # the ln line can be removed because pkgconfig adds both locations - postInstall = " - ensureDir $out/lib - ln -s $out/share/pkgconfig $out/lib/pkgconfig # WTF? - "; -} diff --git a/pkgs/desktops/gnome/gnome-mime-data.nix b/pkgs/desktops/gnome/gnome-mime-data.nix deleted file mode 100644 index 0e86ccdb4471d..0000000000000 --- a/pkgs/desktops/gnome/gnome-mime-data.nix +++ /dev/null @@ -1,8 +0,0 @@ -{input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gettext}: - -assert pkgconfig != null && perl != null; - -stdenv.mkDerivation { - inherit (input) name src; - buildInputs = [pkgconfig perl perlXMLParser gettext]; -} diff --git a/pkgs/desktops/gnome/gnome-panel.nix b/pkgs/desktops/gnome/gnome-panel.nix deleted file mode 100644 index 4ae6598f5e9ee..0000000000000 --- a/pkgs/desktops/gnome/gnome-panel.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser -, libjpeg, libpng, libXmu, libXau, dbus_glib, gettext, libxslt -}: - -stdenv.mkDerivation { - inherit (input) name src; - - buildInputs = [ - pkgconfig perl perlXMLParser gnome.gtk gnome.glib gnome.ORBit2 - gnome.libgnome gnome.libgnomeui gnome.gnomedesktop gnome.libglade - gnome.libwnck libjpeg libpng gnome.scrollkeeper libXmu libXau - dbus_glib gnome.gnomemenus gnome.gnomedocutils gettext libxslt - ]; - - configureFlags = "--disable-scrollkeeper"; -} diff --git a/pkgs/desktops/gnome/gtkdoc.nix b/pkgs/desktops/gnome/gtkdoc.nix deleted file mode 100644 index 5ecb3df72b4f5..0000000000000 --- a/pkgs/desktops/gnome/gtkdoc.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, gtkdoc, pkgconfig, gnomedocutils, perl, python -, libxml2, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_43 -, libxslt, scrollkeeper }: - -stdenv.mkDerivation { - inherit (gtkdoc) name src; - - inherit docbook_xml_dtd_43; - buildInputs = [ pkgconfig perl python gnomedocutils - libxml2 scrollkeeper - xmlto docbook2x docbook_xsl docbook_xml_dtd_43 libxslt ]; - - - # maybe there is a better way to pass the needed dtd and xsl files - # "-//OASIS//DTD DocBook XML V4.1.2//EN" and "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl" - preConfigure = '' - ensureDir $out/nix-support - cat > $out/nix-support/catalog.xml << EOF - <?xml version="1.0"?> - <!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd"> - <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> - <nextCatalog catalog="${docbook_xsl}/xml/xsl/docbook/catalog.xml" /> - <nextCatalog catalog="${docbook_xml_dtd_43}/xml/dtd/docbook/catalog.xml" /> - </catalog> - EOF - - configureFlags="--with-xml-catalog=$out/nix-support/catalog.xml --disable-scrollkeeper"; - ''; -} diff --git a/pkgs/desktops/gnome/gtkhtml.nix b/pkgs/desktops/gnome/gtkhtml.nix deleted file mode 100644 index c3b28f2765d97..0000000000000 --- a/pkgs/desktops/gnome/gtkhtml.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ input, stdenv, fetchurl, perl, perlXMLParser, pkgconfig, atk, gail, gtk -, libgnomeprint, libgnomeprintui, libgnomeui, libglade, gnomeicontheme -, libjpeg, gettext, intltool, enchant, isocodes -}: - -# TODO build complains about missing libsoup and soup. Optional dependency? - -stdenv.mkDerivation { - inherit (input) name src; - - buildInputs = [ - perl perlXMLParser pkgconfig libjpeg - atk gail gtk - libglade libgnomeprint libgnomeprintui libgnomeui - gnomeicontheme gettext intltool enchant isocodes - ]; -} - diff --git a/pkgs/desktops/gnome/gtksourceview.nix b/pkgs/desktops/gnome/gtksourceview.nix deleted file mode 100644 index a5e3bd217fd36..0000000000000 --- a/pkgs/desktops/gnome/gtksourceview.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ input, stdenv, fetchurl, perl, perlXMLParser, pkgconfig -, gtk, libxml2, libgnomeprint, gnomevfs, libbonobo, GConf -, libgnomeprintui, libgnomecanvas -, gettext, intltool -}: - -stdenv.mkDerivation { - inherit (input) name src; - buildInputs = [ - perl perlXMLParser pkgconfig gnomevfs - libbonobo GConf libgnomeprintui libgnomecanvas - gettext intltool - ]; - propagatedBuildInputs = [gtk libxml2 libgnomeprint]; -} diff --git a/pkgs/desktops/gnome/intltool.nix b/pkgs/desktops/gnome/intltool.nix deleted file mode 100644 index 57262e11dd935..0000000000000 --- a/pkgs/desktops/gnome/intltool.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, pkgconfig, perl, perlXMLParser}: - -stdenv.mkDerivation rec { - name = "intltool-0.40.6"; - - src = fetchurl { - url = "http://ftp.acc.umu.se/pub/GNOME/sources/intltool/0.40/${name}.tar.bz2"; - sha256 = "0r1vkvy5xzqk01yl6a0xlrry39bra24alkrx6279b77hc62my7jd"; - }; - - buildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ perl perlXMLParser ]; -} diff --git a/pkgs/desktops/gnome/libIDL.nix b/pkgs/desktops/gnome/libIDL.nix deleted file mode 100644 index 2a2dd49e2d167..0000000000000 --- a/pkgs/desktops/gnome/libIDL.nix +++ /dev/null @@ -1,8 +0,0 @@ -{input, stdenv, fetchurl, pkgconfig, glib, lex, yacc}: - -assert pkgconfig != null && glib != null && lex != null && yacc != null; - -stdenv.mkDerivation { - inherit (input) name src; - buildInputs = [pkgconfig glib lex yacc]; -} diff --git a/pkgs/desktops/gnome/libart_lgpl.nix b/pkgs/desktops/gnome/libart_lgpl.nix deleted file mode 100644 index 4f05f788b4d81..0000000000000 --- a/pkgs/desktops/gnome/libart_lgpl.nix +++ /dev/null @@ -1,5 +0,0 @@ -{input, stdenv, fetchurl}: - -stdenv.mkDerivation { - inherit (input) name src; -} diff --git a/pkgs/desktops/gnome/libbonobo.nix b/pkgs/desktops/gnome/libbonobo.nix deleted file mode 100644 index 0b7d949247e8b..0000000000000 --- a/pkgs/desktops/gnome/libbonobo.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser -, dbus, dbus_glib, ORBit2, libxml2 -, popt, yacc, flex, gettext, intltool }: - -assert pkgconfig != null && perl != null && ORBit2 != null - && libxml2 != null && popt != null && yacc != null && flex != null; - -# todo 2.8.1 doesn;t work -stdenv.mkDerivation { - inherit (input) name src; - buildInputs = [ - pkgconfig perl perlXMLParser libxml2 yacc flex - dbus dbus_glib - gettext intltool - ]; - propagatedBuildInputs = [ORBit2 popt]; -} diff --git a/pkgs/desktops/gnome/libbonoboui.nix b/pkgs/desktops/gnome/libbonoboui.nix deleted file mode 100644 index ca2d5a2f56f53..0000000000000 --- a/pkgs/desktops/gnome/libbonoboui.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libglade, libgnome -, libgnomecanvas, gettext, intltool }: - -assert pkgconfig != null && perl != null && libxml2 != null - && libglade != null && libgnome != null && libgnomecanvas != null; - -# TODO 2.8.1 doesn't work -stdenv.mkDerivation { - inherit (input) name src; - buildInputs = [ pkgconfig perl perlXMLParser libglade gettext intltool ]; - propagatedBuildInputs = [libxml2 libgnome libgnomecanvas]; - - LDFLAGS="-lglib-2.0"; # !!! why? -} diff --git a/pkgs/desktops/gnome/libglade.nix b/pkgs/desktops/gnome/libglade.nix deleted file mode 100644 index 0377c07c0f5ef..0000000000000 --- a/pkgs/desktops/gnome/libglade.nix +++ /dev/null @@ -1,32 +0,0 @@ -{input, stdenv, fetchurl, pkgconfig, gtk, libxml2}: - -assert pkgconfig != null && gtk != null && libxml2 != null; - -stdenv.mkDerivation { - inherit (input) name src; - buildInputs = [pkgconfig]; - propagatedBuildInputs = [gtk libxml2]; - - meta = { - description = "Glade, a User Interface Designer for GTK+ and GNOME"; - - longDescription = '' - Glade is a RAD tool to enable quick & easy development of user - interfaces for the GTK+ toolkit and the GNOME desktop - environment, released under the GNU GPL License. - - The user interfaces designed in Glade are saved as XML, and by - using the libglade library these can be loaded by applications - dynamically as needed. - - By using libglade, Glade XML files can be used in numerous - programming languages including C, C++, Java, Perl, Python, C#, - Pike, Ruby, Haskell, Objective Caml and Scheme. Adding support - for other languages is easy too. - ''; - - license = "LGPLv2+"; - - homepage = http://glade.gnome.org/; - }; -} diff --git a/pkgs/desktops/gnome/libglademm.nix b/pkgs/desktops/gnome/libglademm.nix deleted file mode 100644 index 415963dab4277..0000000000000 --- a/pkgs/desktops/gnome/libglademm.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, libglade, gtkmm }: - -stdenv.mkDerivation rec { - name = "libglademm-2.6.7"; - - src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/libglademm/2.6/${name}.tar.bz2"; - sha256 = "1hrbg9l5qb7w0xvr7013qamkckyj0fqc426c851l69zpmhakqm1q"; - }; - - buildInputs = [ pkgconfig ]; - - # `libglade' must be propagated so that `pkg-config libglademm - # --libs' (or `--cflags') works. - propagatedBuildInputs = [ libglade gtkmm ]; - - meta = { - description = "C++ interface to the libglade graphical user interface library"; - - longDescription = '' - gtkmm is the official C++ interface for the popular GUI library - GTK+. Highlights include typesafe callbacks, and a - comprehensive set of widgets that are easily extensible via - inheritance. You can create user interfaces either in code or - with the Glade User Interface designer, using libglademm. - There's extensive documentation, including API reference and a - tutorial. - ''; - - homepage = http://gtkmm.org/; - - license = "LGPLv2+"; - }; -} diff --git a/pkgs/desktops/gnome/libgnome.nix b/pkgs/desktops/gnome/libgnome.nix deleted file mode 100644 index 9a34009834ffa..0000000000000 --- a/pkgs/desktops/gnome/libgnome.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser -, popt, zlib, esound, gettext, intltool -}: - -# !!! TODO CHECK: -# libgnome tries to install stuff into GConf (which fails): -# "WARNING: failed to install schema `/schemas/desktop/gnome/url-handlers/https/need-terminal' locale `is': Failed: -# Failed to create file `/nix/store/14d4fc76451786eba9dea087d56dc719-GConf-2.4.0/etc/gconf/gconf.xml.defaults/%gconf.xml': Permission denied" - -stdenv.mkDerivation { - inherit (input) name src; - buildInputs = [pkgconfig perl perlXMLParser popt zlib esound gettext intltool]; - propagatedBuildInputs = [gnome.glib gnome.gnomevfs gnome.libbonobo gnome.GConf]; -} diff --git a/pkgs/desktops/gnome/libgnomeui.nix b/pkgs/desktops/gnome/libgnomeui.nix deleted file mode 100644 index 3e56a44198a2f..0000000000000 --- a/pkgs/desktops/gnome/libgnomeui.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser -, esound, libjpeg, gettext, intltool -}: - -stdenv.mkDerivation { - inherit (input) name src; - buildInputs = [ - pkgconfig perl perlXMLParser gnome.libglade esound libjpeg gettext - intltool - ]; - propagatedBuildInputs = [ - gnome.libgnome gnome.libgnomecanvas gnome.libbonoboui libjpeg - gnome.gnomekeyring - ]; -} diff --git a/pkgs/desktops/gnome/libgtkhtml.nix b/pkgs/desktops/gnome/libgtkhtml.nix deleted file mode 100644 index 839ce40147148..0000000000000 --- a/pkgs/desktops/gnome/libgtkhtml.nix +++ /dev/null @@ -1,16 +0,0 @@ -{input, stdenv, fetchurl, perl, perlXMLParser, pkgconfig, gtk, gail, libxml2}: - -assert - null != pkgconfig - && null != perl - && null != perlXMLParser - ; - -stdenv.mkDerivation { - inherit (input) name src; - - buildInputs = [ - perl perlXMLParser pkgconfig gtk libxml2 gail - ]; -} - diff --git a/pkgs/desktops/gnome/libsoup.nix b/pkgs/desktops/gnome/libsoup.nix deleted file mode 100644 index 099fa990a2d3d..0000000000000 --- a/pkgs/desktops/gnome/libsoup.nix +++ /dev/null @@ -1,8 +0,0 @@ -{input, stdenv, fetchurl, pkgconfig, libxml2, glib - , libproxy, GConf, sqlite}: - -stdenv.mkDerivation { - inherit (input) name src; - buildInputs = [pkgconfig libxml2 glib libproxy - GConf sqlite]; -} diff --git a/pkgs/desktops/gnome/make-listing.pl b/pkgs/desktops/gnome/make-listing.pl deleted file mode 100755 index 3b55a214d1778..0000000000000 --- a/pkgs/desktops/gnome/make-listing.pl +++ /dev/null @@ -1,48 +0,0 @@ -#! /usr/bin/perl -w - -use strict; - -# Example use: -# ./make-listing.pl \ -# http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.1/sources/ \ -# http://ftp.gnome.org/pub/GNOME/platform/2.10/2.10.1/sources/MD5SUMS-for-bz2 - -my $baseURL = shift; -my $md5URL = shift; - -print <<EOF -# Note: this file was generated automatically by make-listing.pl! - -{fetchurl} : { -EOF - ; - -open FOO, "curl '$md5URL' |" or die; - -while (<FOO>) { - chomp; - /^(\S+)\s+(\S+)$/ or die; - my $md5 = $1; - my $fileName = $2; - my $name = $fileName; - $name =~ s/\.tar.*$//; - my $attrName = $name; - $attrName =~ s/\-[0-9].*$//; - $attrName =~ s/\-//g; - $attrName =~ s/\+//g; - print <<EOF - $attrName = { - name = "$name"; - src = fetchurl { - url = $baseURL$fileName; - md5 = "$md5"; - }; - }; -EOF - ; - -} - -close FOO; - -print "}\n"; diff --git a/pkgs/desktops/gnome/metacity.nix b/pkgs/desktops/gnome/metacity.nix deleted file mode 100644 index 9d22add6af8c7..0000000000000 --- a/pkgs/desktops/gnome/metacity.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, glib, gtk -, GConf, startupnotification, libXinerama, libXrandr, libXcursor -, gettext, intltool, zenity, gnomedocutils - -, enableCompositor ? false -, libXcomposite ? null, libXfixes ? null, libXdamage ? null, libcm ? null -}: - -assert enableCompositor -> - libXcomposite != null && libXfixes != null && libXdamage != null && libcm != null; - -stdenv.mkDerivation { - inherit (input) name src; - - buildInputs = [ - pkgconfig perl perlXMLParser glib gtk GConf startupnotification - libXinerama libXrandr libXcursor gettext intltool - zenity gnomedocutils - ] - ++ stdenv.lib.optionals enableCompositor [libXcomposite libXfixes libXdamage libcm]; - - configureFlags = '' - ${if enableCompositor then "--enable-compositor" else ""} - ''; -} diff --git a/pkgs/desktops/gnome/no-kerberos.patch b/pkgs/desktops/gnome/no-kerberos.patch deleted file mode 100644 index e34b74bb8a17b..0000000000000 --- a/pkgs/desktops/gnome/no-kerberos.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -rc gnome-vfs-2.8.4-orig/configure gnome-vfs-2.8.4/configure -*** gnome-vfs-2.8.4-orig/configure 2005-02-21 10:20:34.000000000 +0100 ---- gnome-vfs-2.8.4/configure 2005-03-02 13:00:41.000000000 +0100 -*************** -*** 128,134 **** - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -! for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. ---- 128,134 ---- - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -! for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -*************** -*** 306,312 **** - # So, first we look for a working echo in the user's PATH. - - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -! for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && ---- 306,312 ---- - # So, first we look for a working echo in the user's PATH. - - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -! for dir in $PATH; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && -*************** -*** 27670,27676 **** - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -! as_dummy="$PATH:/usr/kerberos/bin" - for as_dir in $as_dummy - do - IFS=$as_save_IFS ---- 27670,27676 ---- - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -! as_dummy="$PATH" - for as_dir in $as_dummy - do - IFS=$as_save_IFS diff --git a/pkgs/desktops/gnome/scrollkeeper.nix b/pkgs/desktops/gnome/scrollkeeper.nix deleted file mode 100644 index 105d585b39fbf..0000000000000 --- a/pkgs/desktops/gnome/scrollkeeper.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser -, libxml2, libxslt, docbook_xml_dtd_42 -}: - -stdenv.mkDerivation { - inherit (input) name src; - preConfigure = " - substituteInPlace extract/dtds/Makefile.am --replace /usr/bin/xmlcatalog xmlcatalog - "; - buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt]; - configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat"; -} diff --git a/pkgs/desktops/gnome/src-gnome-desktop-2.26.0.nix b/pkgs/desktops/gnome/src-gnome-desktop-2.26.0.nix deleted file mode 100644 index 3b5a611241c42..0000000000000 --- a/pkgs/desktops/gnome/src-gnome-desktop-2.26.0.nix +++ /dev/null @@ -1,613 +0,0 @@ -# Note: this file was generated automatically by make-listing.pl! - -{fetchurl} : { - alacarte = { - name = "alacarte-0.11.10"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/alacarte-0.11.10.tar.bz2; - md5 = "1888f6206c5bf4659214ac1b7487efd6"; - }; - }; - brasero = { - name = "brasero-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/brasero-2.26.0.tar.bz2; - md5 = "ef968fe98874da4e26b61591ee57be4a"; - }; - }; - bugbuddy = { - name = "bug-buddy-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/bug-buddy-2.26.0.tar.bz2; - md5 = "f92663a1a819f83e3eb3004f9e8a687a"; - }; - }; - cheese = { - name = "cheese-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/cheese-2.26.0.tar.bz2; - md5 = "17c991c695c3a7549da6e42d1b327d79"; - }; - }; - dasher = { - name = "dasher-4.10.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/dasher-4.10.0.tar.bz2; - md5 = "d07fa31c3a8ead147f981efa90193c56"; - }; - }; - deskbarapplet = { - name = "deskbar-applet-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/deskbar-applet-2.26.0.tar.bz2; - md5 = "168044d1312bf30e71f2ed587d2bffb6"; - }; - }; - ekiga = { - name = "ekiga-3.2.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/ekiga-3.2.0.tar.bz2; - md5 = "01c4c944a1b900b5b3bfa95d3a820b22"; - }; - }; - empathy = { - name = "empathy-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/empathy-2.26.0.tar.bz2; - md5 = "f5b2d8ca7bd5e315491e3d05a7fd03c1"; - }; - }; - eog = { - name = "eog-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/eog-2.26.0.tar.bz2; - md5 = "5d513046f80bc989e715243d8cee2825"; - }; - }; - epiphany = { - name = "epiphany-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/epiphany-2.26.0.tar.bz2; - md5 = "98043cd7332fd3025e9b69f65904e5a4"; - }; - }; - evince = { - name = "evince-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/evince-2.26.0.tar.bz2; - md5 = "11c440e48702231e40066a78aae56f84"; - }; - }; - evolution = { - name = "evolution-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/evolution-2.26.0.tar.bz2; - md5 = "97234b1ecded0232a1b68d2fc03b0252"; - }; - }; - evolutiondataserver = { - name = "evolution-data-server-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/evolution-data-server-2.26.0.tar.bz2; - md5 = "d010845a4ee9604f050403b106c2f416"; - }; - }; - evolutionexchange = { - name = "evolution-exchange-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/evolution-exchange-2.26.0.tar.bz2; - md5 = "845f0a74e4565a6639f3b8adb736cbc1"; - }; - }; - evolutionmapi = { - name = "evolution-mapi-0.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/evolution-mapi-0.26.0.tar.bz2; - md5 = "b0f27b8deda6945356da035e28537d1a"; - }; - }; - evolutionwebcal = { - name = "evolution-webcal-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/evolution-webcal-2.26.0.tar.bz2; - md5 = "a36036a94dd043f57a6d84ab9b6c732c"; - }; - }; - fileroller = { - name = "file-roller-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/file-roller-2.26.0.tar.bz2; - md5 = "795c6b0a2b3b02c5f407b1d9f9b643ef"; - }; - }; - gcalctool = { - name = "gcalctool-5.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gcalctool-5.26.0.tar.bz2; - md5 = "c2162ac18e9c1dae145cb79e677023c5"; - }; - }; - gconfeditor = { - name = "gconf-editor-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gconf-editor-2.26.0.tar.bz2; - md5 = "2dc76415b22d805cfacfcd5fb98f185c"; - }; - }; - gdm = { - name = "gdm-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gdm-2.26.0.tar.bz2; - md5 = "b1a8db2f0e058d3c7b4c9a4600839a14"; - }; - }; - gedit = { - name = "gedit-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gedit-2.26.0.tar.bz2; - md5 = "577b30e6f17f6dce0af7be3e522d6058"; - }; - }; - gnomeapplets = { - name = "gnome-applets-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-applets-2.26.0.tar.bz2; - md5 = "eed64366b0a1f4032506ac7221ce898a"; - }; - }; - gnomebackgrounds = { - name = "gnome-backgrounds-2.24.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-backgrounds-2.24.1.tar.bz2; - md5 = "28e09fcdeef5616bc612b36e5068e413"; - }; - }; - gnomecontrolcenter = { - name = "gnome-control-center-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-control-center-2.26.0.tar.bz2; - md5 = "eed8feccc37712e34d88bd3b20e46962"; - }; - }; - gnomedesktop = { - name = "gnome-desktop-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-desktop-2.26.0.tar.bz2; - md5 = "796fc830e0baff24381809a7abe012f8"; - }; - }; - gnomedesktopsharp = { - name = "gnome-desktop-sharp-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-desktop-sharp-2.26.0.tar.bz2; - md5 = "4bc990900bb318b2ba0b0e7998bb47d1"; - }; - }; - gnomedocutils = { - name = "gnome-doc-utils-0.16.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-doc-utils-0.16.0.tar.bz2; - md5 = "45971197fd48147ee928462d5b74f234"; - }; - }; - gnomegames = { - name = "gnome-games-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-games-2.26.0.tar.bz2; - md5 = "77e03e0caa57daec39e7cf8e09c87598"; - }; - }; - gnomeicontheme = { - name = "gnome-icon-theme-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-icon-theme-2.26.0.tar.bz2; - md5 = "36a4e5e1b2c7c053779a9a399f6146a2"; - }; - }; - gnomekeyring = { - name = "gnome-keyring-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-keyring-2.26.0.tar.bz2; - md5 = "0395fcf79b990465030a2795dcddacb9"; - }; - }; - gnomemag = { - name = "gnome-mag-0.15.5"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-mag-0.15.5.tar.bz2; - md5 = "8d380056b90619f2e0b86e785836fbc4"; - }; - }; - gnomemedia = { - name = "gnome-media-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-media-2.26.0.tar.bz2; - md5 = "3d519bc7d812aed8f6e4288b6d3cdf26"; - }; - }; - gnomemenus = { - name = "gnome-menus-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-menus-2.26.0.tar.bz2; - md5 = "55fd07e67d8334de2e03e4e23c011452"; - }; - }; - gnomenetstatus = { - name = "gnome-netstatus-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-netstatus-2.26.0.tar.bz2; - md5 = "f116157535ec185f0ea7503fafc5edd6"; - }; - }; - gnomenettool = { - name = "gnome-nettool-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-nettool-2.26.0.tar.bz2; - md5 = "34bc06209bb72bd85d45829eecc078cb"; - }; - }; - gnomepanel = { - name = "gnome-panel-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-panel-2.26.0.tar.bz2; - md5 = "27965de9b12952b22b7e232af6acb0de"; - }; - }; - gnomepowermanager = { - name = "gnome-power-manager-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-power-manager-2.26.0.tar.bz2; - md5 = "a3d8815e143323083870f75e71fa1098"; - }; - }; - gnomepythondesktop = { - name = "gnome-python-desktop-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-python-desktop-2.26.0.tar.bz2; - md5 = "fbcf4ef5ec4a8c4eec4d390c5889c80f"; - }; - }; - gnomescreensaver = { - name = "gnome-screensaver-2.25.2"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-screensaver-2.25.2.tar.bz2; - md5 = "e0aa87be6034e0274103f0ef30c1d31d"; - }; - }; - gnomesession = { - name = "gnome-session-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-session-2.26.0.tar.bz2; - md5 = "e17dbce7446b3e42fac2b1cea7dedffd"; - }; - }; - gnomesettingsdaemon = { - name = "gnome-settings-daemon-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-settings-daemon-2.26.0.tar.bz2; - md5 = "c3a2934deccfcf13de15507d4be802d3"; - }; - }; - gnomesharp = { - name = "gnome-sharp-2.24.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-sharp-2.24.1.tar.bz2; - md5 = "408f83f790a5189bcf76ea9299bc6410"; - }; - }; - gnomespeech = { - name = "gnome-speech-0.4.25"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-speech-0.4.25.tar.bz2; - md5 = "89cbc23fc131c33396c0346085759f63"; - }; - }; - gnomesystemmonitor = { - name = "gnome-system-monitor-2.26.0.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-system-monitor-2.26.0.1.tar.bz2; - md5 = "553de9c4912f4af25f92a3380626c0f1"; - }; - }; - gnomesystemtools = { - name = "gnome-system-tools-2.22.2"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-system-tools-2.22.2.tar.bz2; - md5 = "c2c9a2570dd01a38b46a6adb91a2cb2f"; - }; - }; - gnometerminal = { - name = "gnome-terminal-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-terminal-2.26.0.tar.bz2; - md5 = "013e51a2c4dd7dde5db49587952065ae"; - }; - }; - gnomethemes = { - name = "gnome-themes-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-themes-2.26.0.tar.bz2; - md5 = "3f841154544867585504153d57df1fda"; - }; - }; - gnomeuserdocs = { - name = "gnome-user-docs-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-user-docs-2.26.0.tar.bz2; - md5 = "3735096cf4b076696ebed217bf600190"; - }; - }; - gnomeusershare = { - name = "gnome-user-share-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-user-share-2.26.0.tar.bz2; - md5 = "c99133b74a81a78ac0e4e10ef73fada7"; - }; - }; - gnomeutils = { - name = "gnome-utils-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gnome-utils-2.26.0.tar.bz2; - md5 = "667400cfb9bee954028024ac3cf91a09"; - }; - }; - gok = { - name = "gok-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gok-2.26.0.tar.bz2; - md5 = "8cc28ad6010a977c9ccbe8d5b690f636"; - }; - }; - gstpluginsbase = { - name = "gst-plugins-base-0.10.22"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gst-plugins-base-0.10.22.tar.bz2; - md5 = "5d0f1e07f8f6db564971b50f75261e8a"; - }; - }; - gstpluginsgood = { - name = "gst-plugins-good-0.10.14"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gst-plugins-good-0.10.14.tar.bz2; - md5 = "a861ccbb90a176d1242608502f45f0ac"; - }; - }; - gstreamer = { - name = "gstreamer-0.10.22"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gstreamer-0.10.22.tar.bz2; - md5 = "35dd8598837af4074753afe5b59e8ef2"; - }; - }; - gtkengines = { - name = "gtk-engines-2.18.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gtk-engines-2.18.0.tar.bz2; - md5 = "6a7ac01fc9f9429bfb126e068e74eb4f"; - }; - }; - gtkhtml = { - name = "gtkhtml-3.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gtkhtml-3.26.0.tar.bz2; - md5 = "75d3b6dcd939c2ddcad8aa255ab76f90"; - }; - }; - gtksourceview = { - name = "gtksourceview-2.6.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gtksourceview-2.6.0.tar.bz2; - md5 = "dd065ab2e96e51aade949249c5556439"; - }; - }; - gucharmap = { - name = "gucharmap-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gucharmap-2.26.0.tar.bz2; - md5 = "c4384767bd11f43ef997bda7d77600a4"; - }; - }; - gvfs = { - name = "gvfs-1.2.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/gvfs-1.2.0.tar.bz2; - md5 = "d30aa7b099e4a3746da81265d27363da"; - }; - }; - hamsterapplet = { - name = "hamster-applet-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/hamster-applet-2.26.0.tar.bz2; - md5 = "4e2e5853b1101fa98e69c231a2378ae5"; - }; - }; - libgailgnome = { - name = "libgail-gnome-1.20.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/libgail-gnome-1.20.1.tar.bz2; - md5 = "5c5b71af5a8ab2a9403bdae52b20e46c"; - }; - }; - libgnomekbd = { - name = "libgnomekbd-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/libgnomekbd-2.26.0.tar.bz2; - md5 = "aee58c088c4fd980e1bf813ea813c156"; - }; - }; - libgnomeprint = { - name = "libgnomeprint-2.18.6"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/libgnomeprint-2.18.6.tar.bz2; - md5 = "a5aa248058a07de4b3cf444673cfc683"; - }; - }; - libgnomeprintui = { - name = "libgnomeprintui-2.18.4"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/libgnomeprintui-2.18.4.tar.bz2; - md5 = "e76d763f6279b900a63e5fb2909f8810"; - }; - }; - libgtop = { - name = "libgtop-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/libgtop-2.26.0.tar.bz2; - md5 = "a51ff49eddcce4573f7385e4be33158a"; - }; - }; - libgweather = { - name = "libgweather-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/libgweather-2.26.0.tar.bz2; - md5 = "b96016d7b35c66cf251189e9851ee252"; - }; - }; - liboobs = { - name = "liboobs-2.22.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/liboobs-2.22.0.tar.bz2; - md5 = "1b090ecd6c0df58b131795ff9a5c9057"; - }; - }; - librsvg = { - name = "librsvg-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/librsvg-2.26.0.tar.bz2; - md5 = "65dbd726a514fe8b797d26254b8efc1e"; - }; - }; - libsoup = { - name = "libsoup-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/libsoup-2.26.0.tar.bz2; - md5 = "9df9d2b3304213641d3214a774d75ee1"; - }; - }; - libwnck = { - name = "libwnck-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/libwnck-2.26.0.tar.bz2; - md5 = "73873bf666fc18dff04d66c48400b0c5"; - }; - }; - metacity = { - name = "metacity-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/metacity-2.26.0.tar.bz2; - md5 = "eafb624e79fbcdab6da59acc222430b1"; - }; - }; - mousetweaks = { - name = "mousetweaks-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/mousetweaks-2.26.0.tar.bz2; - md5 = "f63556d0db84287118b34e4a1e7421f1"; - }; - }; - nautilus = { - name = "nautilus-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/nautilus-2.26.0.tar.bz2; - md5 = "d26e673de34be4c6d8ab09af89b92270"; - }; - }; - orca = { - name = "orca-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/orca-2.26.0.tar.bz2; - md5 = "d097f28747943a32d50e3b91eab5c518"; - }; - }; - pygtksourceview = { - name = "pygtksourceview-2.5.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/pygtksourceview-2.5.0.tar.bz2; - md5 = "e3d66310ce16bb138e216982ef6697ee"; - }; - }; - seahorse = { - name = "seahorse-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/seahorse-2.26.0.tar.bz2; - md5 = "ddecca2181d4c9f0dfbe412b68508e5d"; - }; - }; - seahorseplugins = { - name = "seahorse-plugins-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/seahorse-plugins-2.26.0.tar.bz2; - md5 = "8936feb29cf9e4b935d1059ee4e416c6"; - }; - }; - soundjuicer = { - name = "sound-juicer-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/sound-juicer-2.26.0.tar.bz2; - md5 = "6dd30f5a8119f9698eabd8220d5c5392"; - }; - }; - swfdecgnome = { - name = "swfdec-gnome-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/swfdec-gnome-2.26.0.tar.bz2; - md5 = "53d611d9a76a06a703650c4b73fd44cc"; - }; - }; - tomboy = { - name = "tomboy-0.14.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/tomboy-0.14.0.tar.bz2; - md5 = "75ab86e08d925c7ab74d88999e2121e7"; - }; - }; - totem = { - name = "totem-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/totem-2.26.0.tar.bz2; - md5 = "c4204177970911e46b555dd317c37611"; - }; - }; - totemplparser = { - name = "totem-pl-parser-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/totem-pl-parser-2.26.0.tar.bz2; - md5 = "2514b1035a5c8a418580b59e0dcec7ca"; - }; - }; - vinagre = { - name = "vinagre-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/vinagre-2.26.0.tar.bz2; - md5 = "6930bec2968c96dfb3407d6492ae42d4"; - }; - }; - vino = { - name = "vino-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/vino-2.26.0.tar.bz2; - md5 = "7a10464824d8446411b90c162d34401e"; - }; - }; - vte = { - name = "vte-0.20.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/vte-0.20.0.tar.bz2; - md5 = "12dde859bc98e039336baff6e9e6b15b"; - }; - }; - yelp = { - name = "yelp-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/yelp-2.26.0.tar.bz2; - md5 = "3413fd051c5ecbfe98819a8fb4ac83dd"; - }; - }; - zenity = { - name = "zenity-2.26.0"; - src = fetchurl { - url = http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/zenity-2.26.0.tar.bz2; - md5 = "6660ce6dac0a6ca495a0e954cb6b40a2"; - }; - }; -} diff --git a/pkgs/desktops/gnome/src-gnome-platform-2.26.0.nix b/pkgs/desktops/gnome/src-gnome-platform-2.26.0.nix deleted file mode 100644 index cf77ccf3119e7..0000000000000 --- a/pkgs/desktops/gnome/src-gnome-platform-2.26.0.nix +++ /dev/null @@ -1,151 +0,0 @@ -# Note: this file was generated automatically by make-listing.pl! - -{fetchurl} : { - atk = { - name = "atk-1.26.0"; - src = fetchurl { - url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/atk-1.26.0.tar.bz2; - md5 = "719229408019c548855673840679f156"; - }; - }; - atspi = { - name = "at-spi-1.26.0"; - src = fetchurl { - url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/at-spi-1.26.0.tar.bz2; - md5 = "3f2f7d29b45eff08adf56af0d31d3984"; - }; - }; - audiofile = { - name = "audiofile-0.2.6"; - src = fetchurl { - url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/audiofile-0.2.6.tar.bz2; - md5 = "3d01302834660850b6141cac1e6f5501"; - }; - }; - esound = { - name = "esound-0.2.41"; - src = fetchurl { - url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/esound-0.2.41.tar.bz2; - md5 = "8d9aad3d94d15e0d59ba9dc0ea990c6c"; - }; - }; - GConf = { - name = "GConf-2.26.0"; - src = fetchurl { - url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/GConf-2.26.0.tar.bz2; - md5 = "b010f0de356ea093c6a73778b13de956"; - }; - }; - glib = { - name = "glib-2.20.0"; - src = fetchurl { - url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/glib-2.20.0.tar.bz2; - md5 = "05188e560dbd8bddd568e24ce10dd003"; - }; - }; - gnomemimedata = { - name = "gnome-mime-data-2.18.0"; - src = fetchurl { - url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/gnome-mime-data-2.18.0.tar.bz2; - md5 = "541858188f80090d12a33b5a7c34d42c"; - }; - }; - gnomevfs = { - name = "gnome-vfs-2.24.1"; - src = fetchurl { - url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/gnome-vfs-2.24.1.tar.bz2; - md5 = "100f9af16dc659e375ee8da45175a28d"; - }; - }; - gnomevfsmonikers = { - name = "gnome-vfs-monikers-2.15.3"; - src = fetchurl { - url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/gnome-vfs-monikers-2.15.3.tar.bz2; - md5 = "b16f0db0482263be3318e269f52bb5b6"; - }; - }; - gtk = { - name = "gtk+-2.16.0"; - src = fetchurl { - url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/gtk+-2.16.0.tar.bz2; - md5 = "139528802794287427fd4d18875b5cf5"; - }; - }; - gtkdoc = { - name = "gtk-doc-1.11"; - src = fetchurl { - url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/gtk-doc-1.11.tar.bz2; - md5 = "b5e268c71fa90aad890cf53715664d0a"; - }; - }; - libart_lgpl = { - name = "libart_lgpl-2.3.20"; - src = fetchurl { - url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/libart_lgpl-2.3.20.tar.bz2; - md5 = "d0ce67f2ebcef1e51a83136c69242a73"; - }; - }; - libbonobo = { - name = "libbonobo-2.24.1"; - src = fetchurl { - url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/libbonobo-2.24.1.tar.bz2; - md5 = "8868b6083392964a6969547ceb8d7cd1"; - }; - }; - libbonoboui = { - name = "libbonoboui-2.24.1"; - src = fetchurl { - url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/libbonoboui-2.24.1.tar.bz2; - md5 = "9ff3ec1c7aefd0b1a15a5b21ecc7b4e4"; - }; - }; - libglade = { - name = "libglade-2.6.4"; - src = fetchurl { - url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/libglade-2.6.4.tar.bz2; - md5 = "d1776b40f4e166b5e9c107f1c8fe4139"; - }; - }; - libgnome = { - name = "libgnome-2.26.0"; - src = fetchurl { - url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/libgnome-2.26.0.tar.bz2; - md5 = "a5634fe9ddc54bbb726cbaaa35abc0b9"; - }; - }; - libgnomecanvas = { - name = "libgnomecanvas-2.26.0"; - src = fetchurl { - url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/libgnomecanvas-2.26.0.tar.bz2; - md5 = "9bbc635e5ae70e63af071af74ba7e72f"; - }; - }; - libgnomeui = { - name = "libgnomeui-2.24.1"; - src = fetchurl { - url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/libgnomeui-2.24.1.tar.bz2; - md5 = "8e7d36dd1decfcf5cc4d5cb93bc4d217"; - }; - }; - libIDL = { - name = "libIDL-0.8.13"; - src = fetchurl { - url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/libIDL-0.8.13.tar.bz2; - md5 = "b43b289a859eb38a710f70622c46e571"; - }; - }; - ORBit2 = { - name = "ORBit2-2.14.17"; - src = fetchurl { - url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/ORBit2-2.14.17.tar.bz2; - md5 = "10bfb957fa4a8935a0b4afaee7d71df7"; - }; - }; - pango = { - name = "pango-1.24.0"; - src = fetchurl { - url = http://ftp.acc.umu.se/pub/GNOME/platform/2.26/2.26.0/sources/pango-1.24.0.tar.bz2; - md5 = "d209f41079833cd2ef2c5e580ab9c5ee"; - }; - }; -} diff --git a/pkgs/desktops/gnome/startup-notification.nix b/pkgs/desktops/gnome/startup-notification.nix deleted file mode 100644 index b8df1c22edc37..0000000000000 --- a/pkgs/desktops/gnome/startup-notification.nix +++ /dev/null @@ -1,6 +0,0 @@ -{input, stdenv, fetchurl, pkgconfig, x11}: - -stdenv.mkDerivation { - inherit (input) name src; - buildInputs = [pkgconfig x11]; -} diff --git a/pkgs/desktops/kde-4.2/admin/builder.sh b/pkgs/desktops/kde-4.2/admin/builder.sh deleted file mode 100644 index 09cb930f04984..0000000000000 --- a/pkgs/desktops/kde-4.2/admin/builder.sh +++ /dev/null @@ -1,13 +0,0 @@ -source $stdenv/setup - -myPatchPhase() -{ - for i in system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py system-config-printer-kde/system-config-printer-kde.py - do - sed -i -e "s|/usr/share/system-config-printer|$system_config_printer/share/system-config-printer|" $i - done - - sed -i -e "s|import cupshelpers.ppds, cupshelpers.cupshelpers|import ppds, cupshelpers|" system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py -} -patchPhase=myPatchPhase -genericBuild diff --git a/pkgs/desktops/kde-4.2/admin/default.nix b/pkgs/desktops/kde-4.2/admin/default.nix deleted file mode 100644 index f7a2de5c115ef..0000000000000 --- a/pkgs/desktops/kde-4.2/admin/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{stdenv, fetchurl, cmake, qt4, pkgconfig, perl, python, - sip, pyqt4, pycups, system_config_printer, rhpl, - kdelibs, kdepimlibs, kdebindings, automoc4, phonon}: - -stdenv.mkDerivation { - name = "kdeadmin-4.2.4"; - src = fetchurl { - url = mirror://kde/stable/4.2.4/src/kdeadmin-4.2.4.tar.bz2; - sha1 = "72a9bfeaacf6bf70f464923f96b28891ad6b671e"; - }; - builder = ./builder.sh; - inherit system_config_printer; - includeAllQtDirs=true; - CMAKE_PREFIX_PATH=kdepimlibs; - buildInputs = [ cmake qt4 pkgconfig perl python sip pyqt4 pycups system_config_printer rhpl - kdelibs kdepimlibs kdebindings automoc4 phonon ]; -} diff --git a/pkgs/desktops/kde-4.2/artwork/default.nix b/pkgs/desktops/kde-4.2/artwork/default.nix deleted file mode 100644 index 8c8b67053b517..0000000000000 --- a/pkgs/desktops/kde-4.2/artwork/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, cmake, qt4, perl, xscreensaver, - kdelibs, kdebase_workspace, automoc4, phonon, strigi, eigen}: - -stdenv.mkDerivation { - name = "kdeartwork-4.2.4"; - src = fetchurl { - url = mirror://kde/stable/4.2.4/src/kdeartwork-4.2.4.tar.bz2; - sha1 = "601fa04bc6fb9bdd5dfa094af04ad204bcc20b14"; - }; - includeAllQtDirs=true; - buildInputs = [ cmake qt4 perl xscreensaver - kdelibs kdebase_workspace automoc4 phonon strigi eigen ]; -} diff --git a/pkgs/desktops/kde-4.2/base-runtime/default.nix b/pkgs/desktops/kde-4.2/base-runtime/default.nix deleted file mode 100644 index bb6267a0b3c37..0000000000000 --- a/pkgs/desktops/kde-4.2/base-runtime/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{stdenv, fetchurl, cmake, perl, bzip2, qt4, alsaLib, xineLib, samba, kdelibs, - automoc4, phonon, strigi, soprano, cluceneCore}: - -stdenv.mkDerivation { - name = "kdebase-runtime-4.2.4"; - src = fetchurl { - url = mirror://kde/Attic/4.2.4/src/kdebase-runtime-4.2.4.tar.bz2; - - sha1 = "dd829270b5fb21e4c24db5e7d16db6e99fe51c1d"; - }; -/* CLUCENE_HOME=cluceneCore;*/ - includeAllQtDirs=true; - buildInputs = [ cmake perl bzip2 qt4 alsaLib xineLib samba stdenv.gcc.libc kdelibs - automoc4 phonon strigi soprano cluceneCore ]; -} diff --git a/pkgs/desktops/kde-4.2/base-workspace/default.nix b/pkgs/desktops/kde-4.2/base-workspace/default.nix deleted file mode 100644 index 19fd20823f18c..0000000000000 --- a/pkgs/desktops/kde-4.2/base-workspace/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl, cmake, perl, python, pam, ConsoleKit, - qt4, sip, pyqt4, kdelibs, kdepimlibs, kdebindings, - libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver, - lm_sensors, libxklavier, libusb, pthread_stubs, boost, - automoc4, phonon, strigi, soprano, qimageblitz}: - -stdenv.mkDerivation { - name = "kdebase-workspace-4.2.4"; - src = fetchurl { - url = mirror://kde/stable/4.2.4/src/kdebase-workspace-4.2.4.tar.bz2; - sha1 = "31f38436736ff73b6ffb9d8bbb93b8342965e894"; - }; - includeAllQtDirs=true; - CMAKE_PREFIX_PATH=kdepimlibs; - buildInputs = [ cmake perl python qt4 pam /*ConsoleKit sip pyqt4*/ kdelibs kdepimlibs /*kdebindings*/ pthread_stubs boost libusb stdenv.gcc.libc - libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver - lm_sensors libxklavier automoc4 phonon strigi soprano qimageblitz ]; -} diff --git a/pkgs/desktops/kde-4.2/base/default.nix b/pkgs/desktops/kde-4.2/base/default.nix deleted file mode 100644 index b608667e06d4d..0000000000000 --- a/pkgs/desktops/kde-4.2/base/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, cmake, perl, qt4, kdelibs, pciutils, libraw1394, - automoc4, phonon, strigi, qimageblitz, soprano}: - -stdenv.mkDerivation { - name = "kdebase-4.2.4"; - src = fetchurl { - url = mirror://kde/stable/4.2.4/src/kdebase-4.2.4.tar.bz2; - sha1 = "c08188baa90a5075f18a75640c4dc3e6dc69daa0"; - }; - includeAllQtDirs=true; - buildInputs = [ cmake perl qt4 kdelibs pciutils stdenv.gcc.libc libraw1394 - automoc4 phonon strigi qimageblitz soprano ]; -} diff --git a/pkgs/desktops/kde-4.2/bindings/builder.sh b/pkgs/desktops/kde-4.2/bindings/builder.sh deleted file mode 100644 index e3f1df28b77cb..0000000000000 --- a/pkgs/desktops/kde-4.2/bindings/builder.sh +++ /dev/null @@ -1,11 +0,0 @@ -source $stdenv/setup - -tar xfvj $src -cd kdebindings-*/python/pykde4 -python configure.py -d $out/lib/python2.5/site-packages -v $out/share/sip -for i in `find . -name Makefile` -do - sed -i -e "s/-O2/-O0/" $i -done -make -make install diff --git a/pkgs/desktops/kde-4.2/bindings/default.nix b/pkgs/desktops/kde-4.2/bindings/default.nix deleted file mode 100644 index 357d1263df74e..0000000000000 --- a/pkgs/desktops/kde-4.2/bindings/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{stdenv, fetchurl, python, sip, pyqt4, zlib, libpng, freetype, fontconfig, qt4, - libSM, libXrender, libXrandr, libXfixes, libXinerama, libXcursor, libXext, kdelibs}: - -# This function will only build the pykde4 module. I don't need the other bindings and -# some bindings are even broken. - -stdenv.mkDerivation { - name = "kdebindings-4.2.4"; - src = fetchurl { - url = mirror://kde/stable/4.2.4/src/kdebindings-4.2.4.tar.bz2; - sha1 = "5550b690d1c63fc63b3603ad73ba2b911158fe96"; - }; - builder = ./builder.sh; - includeAllQtDirs=true; - buildInputs = [ python sip pyqt4 zlib libpng freetype fontconfig qt4 - libSM libXrender libXrandr libXfixes libXcursor libXinerama libXext kdelibs ]; -} diff --git a/pkgs/desktops/kde-4.2/default.nix b/pkgs/desktops/kde-4.2/default.nix deleted file mode 100644 index ac73e161c2531..0000000000000 --- a/pkgs/desktops/kde-4.2/default.nix +++ /dev/null @@ -1,231 +0,0 @@ -pkgs: - -rec { - inherit (pkgs) qt4; - -### SUPPORT - automoc4 = import ./support/automoc4 { - inherit (pkgs) stdenv fetchurl cmake; - inherit (pkgs) qt4; - }; - - phonon = import ./support/phonon { - inherit (pkgs) stdenv fetchurl cmake; - inherit (pkgs) qt4 pthread_stubs gst_all xineLib; - inherit (pkgs.xlibs) libXau libXdmcp; - inherit automoc4; - }; - - strigi = import ./support/strigi { - inherit (pkgs) stdenv fetchurl cmake perl; - inherit (pkgs) bzip2 qt4 libxml2 exiv2 fam log4cxx cluceneCore; - }; - - soprano = import ./support/soprano { - inherit (pkgs) stdenv fetchurl cmake; - inherit (pkgs) qt4 jdk cluceneCore redland; - }; - - qimageblitz = import ./support/qimageblitz { - inherit (pkgs) stdenv fetchurl cmake qt4; - }; - - qca2 = import ./support/qca2 { - inherit (pkgs) stdenv fetchurl which qt4; - }; - - akonadi = import ./support/akonadi { - inherit (pkgs) stdenv fetchurl cmake qt4 shared_mime_info libxslt boost mysql; - inherit automoc4; - }; - - decibel = import ./support/decibel { - inherit (pkgs) stdenv fetchurl cmake qt4 tapioca_qt telepathy_qt dbus; - }; - - eigen = import ./support/eigen { - inherit (pkgs) stdenv fetchurl cmake; - }; - -### LIBS - kdelibs = import ./libs { - inherit (pkgs) stdenv fetchurl cmake qt4 perl bzip2 pcre fam libxml2 libxslt; - inherit (pkgs) giflib jasper openexr aspell avahi shared_mime_info; - inherit automoc4 phonon strigi soprano; - }; - -### BASE - kdebase_workspace = import ./base-workspace { - inherit (pkgs) stdenv fetchurl cmake qt4 perl python pam sip pyqt4; - inherit (pkgs) lm_sensors libxklavier libusb pthread_stubs boost ConsoleKit; - inherit (pkgs.xlibs) libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver; - inherit kdelibs kdepimlibs kdebindings; - inherit automoc4 phonon strigi soprano qimageblitz; - }; - - kdebase = import ./base { - inherit (pkgs) stdenv fetchurl cmake perl qt4 pciutils libraw1394; - inherit kdelibs; - inherit automoc4 phonon strigi qimageblitz soprano; - }; - - kdebase_runtime = import ./base-runtime { - inherit (pkgs) stdenv fetchurl cmake perl bzip2 qt4; - inherit (pkgs) xineLib alsaLib samba cluceneCore; - inherit kdelibs; - inherit automoc4 phonon strigi soprano; - }; - -### ADDITIONAL - - kdepimlibs = import ./pimlibs { - inherit (pkgs) stdenv fetchurl cmake qt4 perl boost cyrus_sasl gpgme libical openldap; - inherit kdelibs; - inherit automoc4 phonon akonadi; - }; - - kdeadmin = import ./admin { - inherit (pkgs) stdenv fetchurl cmake qt4 pkgconfig perl python sip pyqt4 pycups system_config_printer rhpl; - inherit kdelibs kdepimlibs kdebindings; - inherit automoc4 phonon; - }; - - kdeartwork = import ./artwork { - inherit (pkgs) stdenv fetchurl cmake qt4 perl xscreensaver; - inherit kdelibs kdebase_workspace; - inherit automoc4 phonon strigi eigen; - }; - - kdeedu = import ./edu { - inherit (pkgs) stdenv fetchurl cmake qt4 perl libxml2 libxslt openbabel boost; - inherit (pkgs) readline gmm gsl facile ocaml; - inherit kdelibs; - inherit automoc4 phonon; - }; - - kdegraphics = import ./graphics { - inherit (pkgs) stdenv fetchurl cmake perl qt4 exiv2 lcms saneBackends libgphoto2; - inherit (pkgs) libspectre djvulibre chmlib; - inherit (pkgs.xlibs) libXxf86vm; - poppler = pkgs.popplerQt4; - inherit kdelibs; - inherit automoc4 phonon strigi qimageblitz soprano qca2; - }; - - kdemultimedia = import ./multimedia { - inherit (pkgs) stdenv fetchurl cmake perl qt4; - inherit (pkgs) alsaLib xineLib libvorbis flac taglib cdparanoia; - inherit kdelibs; - inherit automoc4 phonon; - }; - - kdenetwork = import ./network { - inherit (pkgs) stdenv fetchurl cmake qt4 perl gmp speex libxml2 libxslt sqlite alsaLib; - inherit (pkgs) libidn libvncserver tapioca_qt libmsn; - inherit (pkgs.xlibs) libXtst libXdamage libXxf86vm; - inherit kdelibs kdepimlibs; - inherit automoc4 phonon qca2 soprano qimageblitz; - }; - - kdepim = import ./pim { - inherit (pkgs) stdenv fetchurl cmake qt4 perl boost gpgme libassuan libgpgerror libxslt; - inherit (pkgs) shared_mime_info; - inherit (pkgs.xlibs) libXScrnSaver; - inherit kdelibs kdepimlibs; - inherit automoc4 phonon akonadi strigi soprano qca2; - }; - - kdeplasma_addons = import ./plasma-addons { - inherit (pkgs) stdenv fetchurl cmake qt4 perl python shared_mime_info; - inherit kdelibs kdebase_workspace kdepimlibs kdegraphics; - inherit automoc4 phonon; - }; - - kdegames = import ./games { - inherit (pkgs) stdenv fetchurl cmake qt4 perl; - inherit kdelibs; - inherit automoc4 phonon qca2; - }; - - kdetoys = import ./toys { - inherit (pkgs) stdenv fetchurl cmake qt4 perl; - inherit kdelibs kdebase_workspace; - inherit automoc4 phonon; - }; - - kdeutils = import ./utils { - inherit (pkgs) stdenv fetchurl cmake qt4 perl python gmp libzip libarchive sip pyqt4 pycups system_config_printer rhpl; - inherit kdelibs kdepimlibs kdebindings; - inherit automoc4 phonon qimageblitz; - }; - -### DEVELOPMENT - - kdebindings = import ./bindings { - inherit (pkgs) stdenv fetchurl python sip zlib libpng pyqt4 freetype fontconfig qt4; - inherit (pkgs.xlibs) libSM libXrender libXrandr libXfixes libXcursor libXinerama libXext; - inherit kdelibs; - }; - - kdesdk = import ./sdk { - inherit (pkgs) stdenv fetchurl cmake qt4 perl libxml2 libxslt boost subversion apr aprutil; - inherit kdelibs kdepimlibs; - inherit automoc4 phonon strigi; - }; - - kdewebdev = import ./webdev { - inherit (pkgs) stdenv fetchurl cmake qt4 perl libxml2 libxslt boost; - inherit kdelibs kdepimlibs; - inherit automoc4 phonon; - }; - -#### EXTRA GEAR - - amarok = import ./extragear/amarok { - inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext curl mysql libxml2 taglib loudmouth; - inherit kdelibs; - inherit automoc4 phonon strigi soprano; - }; - - kdesvn = import ./extragear/kdesvn { - inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext apr aprutil subversion db4; - inherit kdelibs; - inherit automoc4 phonon; - }; - - kmplayer = import ./extragear/kmplayer { - inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext dbus_glib; - inherit (pkgs.gtkLibs) pango gtk; - inherit kdelibs; - inherit automoc4 phonon; - }; - - krusader = import ./extragear/krusader { - inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext; - inherit kdelibs; - inherit automoc4 phonon; - }; - - koffice = import ./extragear/koffice { - inherit (pkgs) stdenv fetchurl cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew; - inherit (pkgs) shared_mime_info gsl gmm wv2 libwpd; - inherit kdelibs kdepimlibs; - inherit automoc4 phonon qimageblitz qca2 eigen; - poppler = pkgs.popplerQt4; - }; - - ktorrent = import ./extragear/ktorrent { - inherit (pkgs) stdenv fetchurl cmake qt4 perl gmp taglib boost gettext; - inherit kdelibs kdepimlibs kdebase_workspace; - inherit automoc4 phonon qca2; - }; - - gtk_qt_engine = import ./extragear/gtk-qt-engine { - inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext; - inherit (pkgs.xlibs) libX11; - inherit (pkgs.gtkLibs) gtk; - inherit (pkgs.gnome) libbonoboui; - inherit kdelibs; - inherit automoc4 phonon; - }; -} diff --git a/pkgs/desktops/kde-4.2/edu/default.nix b/pkgs/desktops/kde-4.2/edu/default.nix deleted file mode 100644 index 5f7b2dc6c3c5b..0000000000000 --- a/pkgs/desktops/kde-4.2/edu/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{stdenv, fetchurl, cmake, qt4, perl, libxml2, libxslt, openbabel, boost, readline, gmm, gsl, - facile, ocaml, - kdelibs, automoc4, phonon}: - -stdenv.mkDerivation { - name = "kdeedu-4.2.4"; - src = fetchurl { - url = mirror://kde/stable/4.2.4/src/kdeedu-4.2.4.tar.bz2; - sha1 = "7b26b946e1981ac57efdd2059eb3bba2808aef4b"; - }; - includeAllQtDirs=true; - buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl facile ocaml - kdelibs automoc4 phonon ]; -} diff --git a/pkgs/desktops/kde-4.2/extragear/amarok/builder.sh b/pkgs/desktops/kde-4.2/extragear/amarok/builder.sh deleted file mode 100644 index c19ba33ffcfc5..0000000000000 --- a/pkgs/desktops/kde-4.2/extragear/amarok/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -source $stdenv/setup - -myPatchPhase() -{ - sed -i -e "s|/usr|$loudmouth|g" cmake/modules/FindLoudmouth.cmake - sed -i -e "s|/usr|$mysql|g" cmake/modules/FindMySQLAmarok.cmake -} -patchPhase=myPatchPhase -genericBuild diff --git a/pkgs/desktops/kde-4.2/extragear/amarok/default.nix b/pkgs/desktops/kde-4.2/extragear/amarok/default.nix deleted file mode 100644 index b841c1ed93259..0000000000000 --- a/pkgs/desktops/kde-4.2/extragear/amarok/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{stdenv, fetchurl, cmake, qt4, perl, gettext, curl, libxml2, mysql, taglib, loudmouth, - kdelibs, automoc4, phonon, strigi, soprano}: - -stdenv.mkDerivation { - name = "amarok-2.0.2"; - src = fetchurl { - url = mirror://kde/stable/amarok/2.0.2/src/amarok-2.0.2.tar.bz2; - md5 = "98b78372ec6ea3432faba356c90c6dbe"; - }; - includeAllQtDirs=true; - inherit mysql loudmouth; - builder = ./builder.sh; - buildInputs = [ cmake qt4 perl stdenv.gcc.libc gettext curl libxml2 mysql taglib loudmouth - kdelibs automoc4 phonon strigi soprano ]; -} diff --git a/pkgs/desktops/kde-4.2/extragear/gtk-qt-engine/builder.sh b/pkgs/desktops/kde-4.2/extragear/gtk-qt-engine/builder.sh deleted file mode 100644 index 259263ca27b32..0000000000000 --- a/pkgs/desktops/kde-4.2/extragear/gtk-qt-engine/builder.sh +++ /dev/null @@ -1,11 +0,0 @@ -source $stdenv/setup - -cmakeFlags="-DINSTALL_PATH_GTK_ENGINES=$out/lib/gtk-2.0/2.10.0/engines -DINSTALL_PATH_GTK_THEMES=$out/share/themes -DINSTALL_PATH_KCONTROL_MODULES=$out/lib"; - -myPatchPhase() -{ - sed -i -e "s|\${KDE4_INCLUDE_DIR}|\${KDE4_INCLUDE_DIR} ../build/kcm_gtk|" kcm_gtk/CMakeLists.txt - sed -i -e "s|\*.po|../../\*.po|" po/CMakeLists.txt -} -patchPhase=myPatchPhase -genericBuild diff --git a/pkgs/desktops/kde-4.2/extragear/gtk-qt-engine/default.nix b/pkgs/desktops/kde-4.2/extragear/gtk-qt-engine/default.nix deleted file mode 100644 index 8a572ba39fb78..0000000000000 --- a/pkgs/desktops/kde-4.2/extragear/gtk-qt-engine/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{stdenv, fetchurl, cmake, qt4, perl, libX11, gtk, libbonoboui, gettext, kdelibs, automoc4, phonon}: - -stdenv.mkDerivation { - name = "gtk-qt-engine-1.1"; - src = fetchurl { - url = http://gtk-qt-engine.googlecode.com/files/gtk-qt-engine-1.1.tar.bz2; - sha256 = "4310f8f179c5ab70cea614a07b0c3e84234d05388dded85596200fa754c290a6"; - }; - buildInputs = [ cmake qt4 perl libX11 gtk libbonoboui gettext kdelibs automoc4 phonon ]; - builder = ./builder.sh; -} diff --git a/pkgs/desktops/kde-4.2/extragear/kdesvn/builder.sh b/pkgs/desktops/kde-4.2/extragear/kdesvn/builder.sh deleted file mode 100644 index ed3b06c00c80c..0000000000000 --- a/pkgs/desktops/kde-4.2/extragear/kdesvn/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -source $stdenv/setup - -myPatchPhase() -{ - sed -i -e "s|/usr|$subversion|g" src/svnqt/cmakemodules/FindSubversion.cmake -} -patchPhase=myPatchPhase -genericBuild diff --git a/pkgs/desktops/kde-4.2/extragear/kdesvn/default.nix b/pkgs/desktops/kde-4.2/extragear/kdesvn/default.nix deleted file mode 100644 index 25e98ec29c424..0000000000000 --- a/pkgs/desktops/kde-4.2/extragear/kdesvn/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{stdenv, fetchurl, cmake, qt4, perl, gettext, apr, aprutil, subversion, db4, - kdelibs, automoc4, phonon}: - -stdenv.mkDerivation { - name = "kdesvn-1.3.0"; - src = fetchurl { - url = http://kdesvn.alwins-world.de/downloads/kdesvn-1.3.0.tar.bz2; - sha256 = "d219c430c98d75d07258057e78c29042777e0368eded7494499361031ac63649"; - }; - includeAllQtDirs=true; - builder = ./builder.sh; - inherit subversion; - buildInputs = [ cmake qt4 perl gettext apr aprutil subversion db4 kdelibs automoc4 phonon ]; -} diff --git a/pkgs/desktops/kde-4.2/extragear/kmplayer/builder.sh b/pkgs/desktops/kde-4.2/extragear/kmplayer/builder.sh deleted file mode 100644 index 92c7515c9a902..0000000000000 --- a/pkgs/desktops/kde-4.2/extragear/kmplayer/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -source $stdenv/setup - -myPatchPhase() -{ - sed -i -e "s|files.length|files.size|" \ - -e "s|chlds.length|chlds.size|" src/kmplayerapp.cpp -} -patchPhase=myPatchPhase -genericBuild diff --git a/pkgs/desktops/kde-4.2/extragear/kmplayer/default.nix b/pkgs/desktops/kde-4.2/extragear/kmplayer/default.nix deleted file mode 100644 index 74444a32a9911..0000000000000 --- a/pkgs/desktops/kde-4.2/extragear/kmplayer/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{stdenv, fetchurl, cmake, qt4, perl, gettext, pango, gtk, dbus_glib, kdelibs, automoc4, phonon}: - -stdenv.mkDerivation { - name = "kmplayer-0.11.1"; - src = fetchurl { - url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.1.tar.bz2; - sha256 = "d10df9c31f540ab9442b75e0be0ed2cff9313de9004a4a8acbe3dbed79d5fddb"; - }; - includeAllQtDirs=true; - builder = ./builder.sh; - buildInputs = [ cmake qt4 perl gettext stdenv.gcc.libc pango gtk dbus_glib kdelibs automoc4 phonon ]; -} diff --git a/pkgs/desktops/kde-4.2/extragear/koffice/default.nix b/pkgs/desktops/kde-4.2/extragear/koffice/default.nix deleted file mode 100644 index 872e2ab7e9564..0000000000000 --- a/pkgs/desktops/kde-4.2/extragear/koffice/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, cmake, qt4, perl, lcms, exiv2, libxml2, libxslt, boost, glew -, shared_mime_info, poppler, gsl, gmm, wv2, libwpd -, kdelibs, kdepimlibs, automoc4, phonon, qimageblitz, qca2, eigen}: - -stdenv.mkDerivation { - name = "koffice-2.0.0"; - src = fetchurl { - url = mirror://kde/stable/koffice-2.0.0/src/koffice-2.0.0.tar.bz2; - sha256 = "8cfc35acf4b6d306245e7705899167fd1b67a861136551ab02a0cd7542eb72e9"; - }; - includeAllQtDirs=true; - CMAKE_PREFIX_PATH=kdepimlibs; - buildInputs = [ cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew shared_mime_info - poppler gsl gmm wv2 libwpd - kdelibs kdepimlibs automoc4 phonon qimageblitz qca2 eigen ]; -} diff --git a/pkgs/desktops/kde-4.2/extragear/krusader/default.nix b/pkgs/desktops/kde-4.2/extragear/krusader/default.nix deleted file mode 100644 index d740b4dd3f608..0000000000000 --- a/pkgs/desktops/kde-4.2/extragear/krusader/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{stdenv, fetchurl, cmake, qt4, perl, gettext, kdelibs, automoc4, phonon}: - -stdenv.mkDerivation { - name = "krusader-2.0.0"; - src = fetchurl { - url = mirror://sourceforge/krusader/krusader-2.0.0.tar.gz; - sha256 = "dc74c47d6eaf1c28165a74750e5a1b0341fa1c0d436658d0d5f85a6149f4852c"; - }; - includeAllQtDirs=true; - buildInputs = [ cmake qt4 perl gettext kdelibs automoc4 phonon ]; -} diff --git a/pkgs/desktops/kde-4.2/extragear/ktorrent/default.nix b/pkgs/desktops/kde-4.2/extragear/ktorrent/default.nix deleted file mode 100644 index 0a60fa82d29eb..0000000000000 --- a/pkgs/desktops/kde-4.2/extragear/ktorrent/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{stdenv, fetchurl, cmake, qt4, perl, gmp, taglib, boost, gettext, - kdelibs, kdepimlibs, kdebase_workspace, automoc4, phonon, qca2}: - -stdenv.mkDerivation { - name = "ktorrent-3.2.1"; - src = fetchurl { - url = http://ktorrent.org/downloads/3.2.1/ktorrent-3.2.1.tar.bz2; - sha256 = "e37324519fdd04cad2a489fb772cbe628d8ff9f578e2bb913b18a1404dd7c4eb"; - }; - includeAllQtDirs=true; - CMAKE_PREFIX_PATH=kdepimlibs; - cmakeFlags = "-DTASKMANAGER_INCLUDE_DIR=${kdebase_workspace}/include"; - buildInputs = [ cmake qt4 perl gmp taglib boost gettext stdenv.gcc.libc - kdelibs kdepimlibs kdebase_workspace automoc4 phonon qca2 ]; -} diff --git a/pkgs/desktops/kde-4.2/games/default.nix b/pkgs/desktops/kde-4.2/games/default.nix deleted file mode 100644 index 587854eaaa4db..0000000000000 --- a/pkgs/desktops/kde-4.2/games/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{stdenv, fetchurl, cmake, qt4, perl, kdelibs, automoc4, phonon, qca2}: - -stdenv.mkDerivation { - name = "kdegames-4.2.4"; - src = fetchurl { - url = mirror://kde/stable/4.2.4/src/kdegames-4.2.4.tar.bz2; - sha1 = "c940d73616734fabdfcd0c5961459ba168494b16"; - }; - includeAllQtDirs=true; - buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon qca2 ]; -} diff --git a/pkgs/desktops/kde-4.2/graphics/default.nix b/pkgs/desktops/kde-4.2/graphics/default.nix deleted file mode 100644 index cd3bce0f85ca6..0000000000000 --- a/pkgs/desktops/kde-4.2/graphics/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{stdenv, fetchurl, cmake, perl, qt4, exiv2, lcms, saneBackends, libgphoto2, - libspectre, poppler, djvulibre, chmlib, libXxf86vm, - kdelibs, automoc4, phonon, strigi, qimageblitz, soprano, qca2}: - -stdenv.mkDerivation { - name = "kdegraphics-4.2.4"; - src = fetchurl { - url = mirror://kde/stable/4.2.4/src/kdegraphics-4.2.4.tar.bz2; - sha1 = "032352e87be16ae90f09183a466e61487ef1e738"; - }; - includeAllQtDirs=true; - buildInputs = [ cmake perl qt4 exiv2 lcms saneBackends libgphoto2 libspectre poppler chmlib - stdenv.gcc.libc libXxf86vm - kdelibs automoc4 phonon strigi qimageblitz soprano qca2 ]; -} diff --git a/pkgs/desktops/kde-4.2/libs/default.nix b/pkgs/desktops/kde-4.2/libs/default.nix deleted file mode 100644 index 3717d1078f822..0000000000000 --- a/pkgs/desktops/kde-4.2/libs/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, cmake, perl -, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper -, openexr, aspell, avahi -, automoc4, phonon, strigi, soprano -}: - -stdenv.mkDerivation { - name = "kdelibs-4.2.4"; - - src = fetchurl { - url = mirror://kde/Attic/4.2.4/src/kdelibs-4.2.4.tar.bz2; - sha1 = "259947ede89daec94475a811a41ae7474bc4fd17"; - }; - - includeAllQtDirs = true; - - buildInputs = [ - cmake perl qt4 stdenv.gcc.libc bzip2 pcre fam libxml2 libxslt - shared_mime_info giflib jasper /* openexr */ aspell avahi - automoc4 phonon strigi soprano - ]; -} diff --git a/pkgs/desktops/kde-4.2/multimedia/default.nix b/pkgs/desktops/kde-4.2/multimedia/default.nix deleted file mode 100644 index 328b6aacf936e..0000000000000 --- a/pkgs/desktops/kde-4.2/multimedia/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, cmake, perl, qt4, alsaLib, libvorbis, xineLib, taglib, flac, cdparanoia, - kdelibs, automoc4, phonon}: - -stdenv.mkDerivation { - name = "kdemultimedia-4.2.4"; - src = fetchurl { - url = mirror://kde/stable/4.2.4/src/kdemultimedia-4.2.4.tar.bz2; - sha1 = "ab1f9e38ab38d502aa771a70137ded811f40ad1c"; - }; - includeAllQtDirs=true; - buildInputs = [ cmake perl qt4 alsaLib libvorbis xineLib flac taglib cdparanoia - kdelibs automoc4 phonon ]; -} diff --git a/pkgs/desktops/kde-4.2/network/default.nix b/pkgs/desktops/kde-4.2/network/default.nix deleted file mode 100644 index fd99c2d2ed48b..0000000000000 --- a/pkgs/desktops/kde-4.2/network/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl, cmake, qt4, perl, speex, gmp, libxml2, libxslt, sqlite, alsaLib, libidn, - libvncserver, tapioca_qt, libmsn, - libXtst, libXdamage, libXxf86vm, - kdelibs, kdepimlibs, automoc4, phonon, qca2, soprano, qimageblitz}: - -stdenv.mkDerivation { - name = "kdenetwork-4.2.4"; - src = fetchurl { - url = mirror://kde/stable/4.2.4/src/kdenetwork-4.2.4.tar.bz2; - sha1 = "31f3f1c44690339ce523c309a3d2c131563d9f97"; - }; - includeAllQtDirs=true; - CMAKE_PREFIX_PATH=kdepimlibs; - buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn - libvncserver tapioca_qt libmsn - libXtst libXdamage libXxf86vm - kdelibs kdepimlibs automoc4 phonon qca2 soprano qimageblitz ]; -} diff --git a/pkgs/desktops/kde-4.2/pim/builder.sh b/pkgs/desktops/kde-4.2/pim/builder.sh deleted file mode 100644 index acc357c8a94cf..0000000000000 --- a/pkgs/desktops/kde-4.2/pim/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -source $stdenv/setup - -myPatchPhase() -{ - find .. -name CMakeLists.txt | xargs sed -i -e "s@DESTINATION \${KDE4_DBUS_INTERFACES_DIR}@DESTINATION \${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces/@" -} -patchPhase=myPatchPhase -genericBuild diff --git a/pkgs/desktops/kde-4.2/pim/default.nix b/pkgs/desktops/kde-4.2/pim/default.nix deleted file mode 100644 index f272d82c60bde..0000000000000 --- a/pkgs/desktops/kde-4.2/pim/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{stdenv, fetchurl, cmake, qt4, perl, boost, gpgme, libassuan, libgpgerror, libxslt, - shared_mime_info, libXScrnSaver, - kdelibs, kdepimlibs, automoc4, phonon, akonadi, strigi, soprano, qca2}: - -stdenv.mkDerivation { - name = "kdepim-4.2.4"; - src = fetchurl { - url = mirror://kde/stable/4.2.4/src/kdepim-4.2.4.tar.bz2; - sha1 = "d2328af104edf6471e3474ccea39710e0e1babc9"; - }; - includeAllQtDirs=true; - CMAKE_PREFIX_PATH=kdepimlibs; - builder = ./builder.sh; - buildInputs = [ cmake qt4 perl boost gpgme stdenv.gcc.libc libassuan libgpgerror libxslt - shared_mime_info libXScrnSaver - kdelibs kdepimlibs automoc4 phonon akonadi strigi soprano qca2 ]; -} diff --git a/pkgs/desktops/kde-4.2/pimlibs/default.nix b/pkgs/desktops/kde-4.2/pimlibs/default.nix deleted file mode 100644 index 38c72a18d0f3c..0000000000000 --- a/pkgs/desktops/kde-4.2/pimlibs/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, cmake, qt4, perl, boost, cyrus_sasl, gpgme, libical, openldap, - kdelibs, automoc4, phonon, akonadi}: - -stdenv.mkDerivation { - name = "kdepimlibs-4.2.4"; - src = fetchurl { - url = mirror://kde/stable/4.2.4/src/kdepimlibs-4.2.4.tar.bz2; - sha1 = "1deb9298fe935ed1a53fad8e2a060fdc1c3e4ad8"; - }; - includeAllQtDirs=true; - buildInputs = [ cmake qt4 perl boost cyrus_sasl gpgme stdenv.gcc.libc libical openldap - kdelibs automoc4 phonon akonadi ]; -} diff --git a/pkgs/desktops/kde-4.2/plasma-addons/builder.sh b/pkgs/desktops/kde-4.2/plasma-addons/builder.sh deleted file mode 100644 index 7e56e26e0534b..0000000000000 --- a/pkgs/desktops/kde-4.2/plasma-addons/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -source $stdenv/setup - -myPatchPhase() -{ - sed -i -e "s@\${DBUS_INTERFACES_INSTALL_DIR}@\$ENV{kdebase_workspace}/share/dbus-1/interfaces@" applets/lancelot/app/src/CMakeLists.txt -} - -patchPhase=myPatchPhase -genericBuild diff --git a/pkgs/desktops/kde-4.2/plasma-addons/default.nix b/pkgs/desktops/kde-4.2/plasma-addons/default.nix deleted file mode 100644 index 5fd04f71717f7..0000000000000 --- a/pkgs/desktops/kde-4.2/plasma-addons/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{stdenv, fetchurl, cmake, qt4, perl, python, shared_mime_info, - kdelibs, kdebase_workspace, kdepimlibs, kdegraphics, automoc4, phonon}: - -stdenv.mkDerivation { - name = "kdeplasma-addons-4.2.4"; - src = fetchurl { - url = mirror://kde/stable/4.2.4/src/kdeplasma-addons-4.2.4.tar.bz2; - sha1 = "500d05cc6eeb218b8615b1a49e69e3b9e88f3997"; - }; - inherit kdebase_workspace; - builder = ./builder.sh; - includeAllQtDirs=true; - CMAKE_PREFIX_PATH=kdepimlibs; - buildInputs = [ cmake qt4 perl python shared_mime_info - kdelibs kdebase_workspace kdepimlibs kdegraphics automoc4 phonon ]; -} diff --git a/pkgs/desktops/kde-4.2/sdk/builder.sh b/pkgs/desktops/kde-4.2/sdk/builder.sh deleted file mode 100644 index a83d7d44c0d5f..0000000000000 --- a/pkgs/desktops/kde-4.2/sdk/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -source $stdenv/setup - -myPatchPhase() -{ - sed -i -e "s|\${SVN_INCLUDES}|\${SVN_INCLUDES} $aprutil/include/apr-1|" kioslave/svn/CMakeLists.txt -} -patchPhase=myPatchPhase -genericBuild diff --git a/pkgs/desktops/kde-4.2/sdk/default.nix b/pkgs/desktops/kde-4.2/sdk/default.nix deleted file mode 100644 index 73a50ef44aa8f..0000000000000 --- a/pkgs/desktops/kde-4.2/sdk/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{stdenv, fetchurl, cmake, qt4, perl, libxml2, libxslt, boost, subversion, apr, aprutil, - kdelibs, kdepimlibs, automoc4, phonon, strigi}: - -stdenv.mkDerivation { - name = "kdesdk-4.2.4"; - src = fetchurl { - url = mirror://kde/stable/4.2.4/src/kdesdk-4.2.4.tar.bz2; - sha1 = "ad5a00f5ee4ae0f627b971b7413edb0550e92db1"; - }; - includeAllQtDirs=true; - CMAKE_PREFIX_PATH=kdepimlibs; - builder=./builder.sh; - inherit aprutil; - buildInputs = [ cmake qt4 perl libxml2 libxslt boost subversion apr aprutil - kdelibs kdepimlibs automoc4 phonon strigi ]; -} diff --git a/pkgs/desktops/kde-4.2/support/akonadi/default.nix b/pkgs/desktops/kde-4.2/support/akonadi/default.nix deleted file mode 100644 index 760260a687606..0000000000000 --- a/pkgs/desktops/kde-4.2/support/akonadi/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, mysql, automoc4}: - -stdenv.mkDerivation { - name = "akonadi-1.1.2"; - src = fetchurl { - url = http://download.akonadi-project.org/akonadi-1.1.2.tar.bz2; - sha256 = "1km5mbcsx8xbb327lbva1pm8a8mjai64kqxww1qzbxz9a20w3css"; - }; - includeAllQtDirs=true; - buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 ]; -} diff --git a/pkgs/desktops/kde-4.2/support/automoc4/default.nix b/pkgs/desktops/kde-4.2/support/automoc4/default.nix deleted file mode 100644 index 8826396b1856b..0000000000000 --- a/pkgs/desktops/kde-4.2/support/automoc4/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{stdenv, fetchurl, cmake, -qt4}: - -stdenv.mkDerivation { - name = "automoc4-0.9.88"; - src = fetchurl { - url = mirror://kde/stable/automoc4/0.9.88/automoc4-0.9.88.tar.bz2; - md5 = "91bf517cb940109180ecd07bc90c69ec"; - }; - buildInputs = [ cmake qt4 ]; -} diff --git a/pkgs/desktops/kde-4.2/support/decibel/default.nix b/pkgs/desktops/kde-4.2/support/decibel/default.nix deleted file mode 100644 index dab71739f6a7f..0000000000000 --- a/pkgs/desktops/kde-4.2/support/decibel/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchurl, cmake, qt4, tapioca_qt, telepathy_qt}: - -stdenv.mkDerivation { - name = "decibel-0.5.0"; - src = fetchurl { - url = http://decibel.kde.org/fileadmin/downloads/decibel/releases/decibel-0.5.0.tar.gz; - md5 = "7de299ace568c87a746388ad765228e5"; - }; - buildInputs = [ cmake qt4 tapioca_qt telepathy_qt ]; -} diff --git a/pkgs/desktops/kde-4.2/support/eigen/default.nix b/pkgs/desktops/kde-4.2/support/eigen/default.nix deleted file mode 100644 index 8ad17db3e04c6..0000000000000 --- a/pkgs/desktops/kde-4.2/support/eigen/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchurl, cmake}: - -stdenv.mkDerivation { - name = "eigen-2.0.0"; - src = fetchurl { - url = http://download.tuxfamily.org/eigen/eigen-2.0.0.tar.bz2; - md5 = "bedfe344498b926a4b5db17d2846dbb5"; - }; - buildInputs = [ cmake ]; -} diff --git a/pkgs/desktops/kde-4.2/support/phonon/default.nix b/pkgs/desktops/kde-4.2/support/phonon/default.nix deleted file mode 100644 index 464b468474375..0000000000000 --- a/pkgs/desktops/kde-4.2/support/phonon/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl, cmake, -libXau, libXdmcp, -qt4, pthread_stubs, -gst_all, xineLib, -automoc4}: - -stdenv.mkDerivation { - name = "phonon-4.3.1"; - src = fetchurl { - url = mirror://kde/stable/4.2.1/src/phonon-4.3.1.tar.bz2; - sha1 = "f7537e5280d0a4cc1348975daa7a7e45d833d45c"; - }; - includeAllQtDirs = true; - buildInputs = [ cmake - libXau libXdmcp - qt4 pthread_stubs gst_all.gstreamer gst_all.gstPluginsBase xineLib - automoc4 ]; -} diff --git a/pkgs/desktops/kde-4.2/support/qca2/default.nix b/pkgs/desktops/kde-4.2/support/qca2/default.nix deleted file mode 100644 index d54c3acd69fb0..0000000000000 --- a/pkgs/desktops/kde-4.2/support/qca2/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchurl, which, qt4}: - -stdenv.mkDerivation { - name = "qca-2.0.1"; - src = fetchurl { - url = http://delta.affinix.com/download/qca/2.0/qca-2.0.1.tar.bz2; - md5 = "a0a87d0b3210e23f8c1713562282b7d6"; - }; - buildInputs = [ which qt4 ]; -} diff --git a/pkgs/desktops/kde-4.2/support/qimageblitz/default.nix b/pkgs/desktops/kde-4.2/support/qimageblitz/default.nix deleted file mode 100644 index e5fb050ebaa70..0000000000000 --- a/pkgs/desktops/kde-4.2/support/qimageblitz/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{stdenv, fetchurl, cmake, qt4}: - -stdenv.mkDerivation { - name = "qimageblitz-0.0.4"; - src = fetchurl { - url = mirror://sourceforge/qimageblitz/qimageblitz-0.0.4.tar.bz2; - md5 = "cb87c7f1c0455e8984ee4830f1e749cf"; - }; - includeAllQtDirs = true; - buildInputs = [ cmake qt4 ]; -} diff --git a/pkgs/desktops/kde-4.2/support/soprano/default.nix b/pkgs/desktops/kde-4.2/support/soprano/default.nix deleted file mode 100644 index a19270e939a96..0000000000000 --- a/pkgs/desktops/kde-4.2/support/soprano/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{stdenv, fetchurl, cmake, qt4, jdk, cluceneCore, redland}: - -stdenv.mkDerivation { - name = "soprano-2.2.3"; - - src = fetchurl { - url = mirror://sourceforge/soprano/soprano-2.2.3.tar.bz2; - md5 = "22c992a252144ae0a3a964ba2f6f1933"; - }; - - #JAVA_HOME=jdk; - - buildInputs = [ cmake qt4 /* jdk */ cluceneCore redland ]; - - meta = { - homepage = http://soprano.sourceforge.net/; - description = "An object-oriented C++/Qt4 framework for RDF data"; - }; -} diff --git a/pkgs/desktops/kde-4.2/support/strigi/default.nix b/pkgs/desktops/kde-4.2/support/strigi/default.nix deleted file mode 100644 index e95556d0eb361..0000000000000 --- a/pkgs/desktops/kde-4.2/support/strigi/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, cmake, perl, bzip2, qt4, libxml2, exiv2, fam -, log4cxx, cluceneCore -}: - -stdenv.mkDerivation { - name = "strigi-0.6.4"; - - src = fetchurl { - url = mirror://sourceforge/strigi/strigi-0.6.4.tar.bz2; - md5 = "324fd9606ac77765501717ff92c04f9a"; - }; - - includeAllQtDirs = true; - - CLUCENE_HOME = cluceneCore; - - buildInputs = [ - cmake perl bzip2 stdenv.gcc.libc qt4 libxml2 exiv2 fam /* log4cxx */ cluceneCore - ]; - - meta = { - homepage = http://strigi.sourceforge.net/; - description = "A very fast and efficient crawler to index data on your harddrive"; - }; -} diff --git a/pkgs/desktops/kde-4.2/toys/default.nix b/pkgs/desktops/kde-4.2/toys/default.nix deleted file mode 100644 index 3b375f4f8a709..0000000000000 --- a/pkgs/desktops/kde-4.2/toys/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{stdenv, fetchurl, cmake, qt4, perl, kdelibs, kdebase_workspace, automoc4, phonon}: - -stdenv.mkDerivation { - name = "kdetoys-4.2.4"; - src = fetchurl { - url = mirror://kde/stable/4.2.4/src/kdetoys-4.2.4.tar.bz2; - sha1 = "3f05154f85d0a01ceb97854e31adff03a7b5fdda"; - }; - includeAllQtDirs=true; - buildInputs = [ cmake qt4 perl kdelibs kdebase_workspace automoc4 phonon ]; -} diff --git a/pkgs/desktops/kde-4.2/utils/builder.sh b/pkgs/desktops/kde-4.2/utils/builder.sh deleted file mode 100644 index c1ec2b7e1cd83..0000000000000 --- a/pkgs/desktops/kde-4.2/utils/builder.sh +++ /dev/null @@ -1,13 +0,0 @@ -source $stdenv/setup - -myPatchPhase() -{ - for i in printer-applet/cmake-modules/FindSystemConfigPrinter.py printer-applet/printer-applet.py - do - sed -i -e "s|/usr/share/system-config-printer|$system_config_printer/share/system-config-printer|" $i - done - - sed -i -e "s|import cupshelpers.ppds, cupshelpers.cupshelpers|import ppds, cupshelpers|" printer-applet/cmake-modules/FindSystemConfigPrinter.py -} -patchPhase=myPatchPhase -genericBuild diff --git a/pkgs/desktops/kde-4.2/utils/default.nix b/pkgs/desktops/kde-4.2/utils/default.nix deleted file mode 100644 index ed45501327328..0000000000000 --- a/pkgs/desktops/kde-4.2/utils/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{stdenv, fetchurl, cmake, qt4, perl, gmp, python, libzip, libarchive, sip, pyqt4, pycups, system_config_printer, rhpl, - kdelibs, kdepimlibs, kdebindings, automoc4, phonon, qimageblitz}: - -stdenv.mkDerivation { - name = "kdeutils-4.2.4"; - src = fetchurl { - url = mirror://kde/stable/4.2.4/src/kdeutils-4.2.4.tar.bz2; - sha1 = "59bb17463bec48c77768e50fb0e9ec3c1b0827af"; - }; - builder = ./builder.sh; - inherit system_config_printer; - includeAllQtDirs=true; - CMAKE_PREFIX_PATH=kdepimlibs; - buildInputs = [ cmake qt4 perl gmp python libzip libarchive sip pyqt4 pycups system_config_printer rhpl - kdelibs kdepimlibs kdebindings automoc4 phonon qimageblitz ]; -} diff --git a/pkgs/desktops/kde-4.2/webdev/default.nix b/pkgs/desktops/kde-4.2/webdev/default.nix deleted file mode 100644 index f4a12e6779a5b..0000000000000 --- a/pkgs/desktops/kde-4.2/webdev/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, cmake, qt4, perl, libxml2, libxslt, boost, - kdelibs, kdepimlibs, automoc4, phonon}: - -stdenv.mkDerivation { - name = "kdewebdev-4.2.4"; - src = fetchurl { - url = mirror://kde/stable/4.2.4/src/kdewebdev-4.2.4.tar.bz2; - sha1 = "9e3667c994793232177a70ff0b6fb2caa252757f"; - }; - includeAllQtDirs=true; - CMAKE_PREFIX_PATH=kdepimlibs; - buildInputs = [ cmake qt4 perl libxml2 libxslt boost kdelibs kdepimlibs automoc4 phonon ]; -} diff --git a/pkgs/desktops/kde-4.3/base-workspace/default.nix b/pkgs/desktops/kde-4.3/base-workspace/default.nix index 48b4be450b33d..4375210976501 100644 --- a/pkgs/desktops/kde-4.3/base-workspace/default.nix +++ b/pkgs/desktops/kde-4.3/base-workspace/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, lib, cmake, perl, python, pam, ConsoleKit , qt4, sip, pyqt4, kdelibs, kdelibs_experimental, kdepimlibs, kdebindings , libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver -, lm_sensors, libxklavier, libusb, pthread_stubs, boost +, lm_sensors, libxklavier, libusb, libpthreadstubs, boost , automoc4, phonon, strigi, soprano, qimageblitz, akonadi, polkit_qt }: @@ -15,7 +15,7 @@ stdenv.mkDerivation { CMAKE_PREFIX_PATH=kdepimlibs; inherit kdelibs_experimental; builder = ./builder.sh; - buildInputs = [ cmake perl python qt4 pam /*ConsoleKit sip pyqt4*/ kdelibs kdelibs_experimental kdepimlibs /*kdebindings*/ pthread_stubs boost libusb stdenv.gcc.libc + buildInputs = [ cmake perl python qt4 pam /*ConsoleKit sip pyqt4*/ kdelibs kdelibs_experimental kdepimlibs /*kdebindings*/ libpthreadstubs boost libusb stdenv.gcc.libc libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver lm_sensors libxklavier automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt ]; meta = { diff --git a/pkgs/desktops/kde-4.3/default.nix b/pkgs/desktops/kde-4.3/default.nix index 4dfcd8c924e1c..e622a4fb46c48 100644 --- a/pkgs/desktops/kde-4.3/default.nix +++ b/pkgs/desktops/kde-4.3/default.nix @@ -11,8 +11,8 @@ pkgs.recurseIntoAttrs (rec { phonon = import ./support/phonon { inherit (pkgs) stdenv fetchurl lib cmake; - inherit (pkgs) qt4 pthread_stubs gst_all xineLib; - inherit (pkgs.xlibs) libXau libXdmcp; + inherit (pkgs) qt4 gst_all xineLib; + inherit (pkgs.xlibs) libXau libXdmcp libpthreadstubs; inherit automoc4; }; @@ -68,8 +68,8 @@ pkgs.recurseIntoAttrs (rec { ### BASE kdebase_workspace = import ./base-workspace { inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python pam sip pyqt4; - inherit (pkgs) lm_sensors libxklavier libusb pthread_stubs boost ConsoleKit; - inherit (pkgs.xlibs) libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver; + inherit (pkgs) lm_sensors libxklavier libusb boost ConsoleKit; + inherit (pkgs.xlibs) libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver libpthreadstubs; inherit kdelibs kdelibs_experimental kdepimlibs kdebindings; inherit automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt; }; diff --git a/pkgs/desktops/kde-4.3/support/phonon/default.nix b/pkgs/desktops/kde-4.3/support/phonon/default.nix index 667e64287f5d5..2e538107009ba 100644 --- a/pkgs/desktops/kde-4.3/support/phonon/default.nix +++ b/pkgs/desktops/kde-4.3/support/phonon/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, cmake, qt4 -, libXau, libXdmcp, pthread_stubs +, libXau, libXdmcp, libpthreadstubs , gst_all, xineLib, automoc4}: stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha1 = "f7537e5280d0a4cc1348975daa7a7e45d833d45c"; }; includeAllQtDirs = true; - buildInputs = [ cmake qt4 libXau libXdmcp pthread_stubs gst_all.gstreamer gst_all.gstPluginsBase xineLib automoc4 ]; + buildInputs = [ cmake qt4 libXau libXdmcp libpthreadstubs gst_all.gstreamer gst_all.gstPluginsBase xineLib automoc4 ]; meta = { description = "KDE Multimedia API"; longDescription = "KDE Multimedia API which abstracts over various backends such as GStreamer and Xine"; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 6ca2ce07670d1..dc8bb2a9b523a 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,31 +1,34 @@ { postscriptSupport ? true , pdfSupport ? true , pngSupport ? true +, xcbSupport ? false , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype -, zlib, libpng, pixman, libxcb, xcbutil +, 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.8.6"; + name = "cairo-1.8.8"; src = fetchurl { url = "http://cairographics.org/releases/${name}.tar.gz"; - sha256 = "0d9mfwq7r66j85hqjcjavwbn7c8gdaqnahmmiyz5iwpc1jplg8wk"; + sha256 = "140w8pz2k2kmjdaav3rfy009rjf2hqycsnk7lq0nwnf4bpgd6l9w"; }; - buildInputs = [ - pkgconfig x11 fontconfig pixman libxcb xcbutil - ]; + buildInputs = + [ pkgconfig x11 fontconfig pixman ] ++ + stdenv.lib.optionals xcbSupport [ libxcb xcbutil ]; propagatedBuildInputs = [ freetype ] ++ stdenv.lib.optional postscriptSupport zlib ++ stdenv.lib.optional pngSupport libpng; - configureFlags = ["--enable-xcb"] ++ + configureFlags = + stdenv.lib.optional xcbSupport "--enable-xcb" ++ stdenv.lib.optional pdfSupport "--enable-pdf"; preConfigure = '' diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index c30f64b0a9b1a..b760003ef4df3 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, pkgconfig, cairo, x11, fontconfig, freetype, libsigcxx }: stdenv.mkDerivation rec { - name = "cairomm-1.7.2"; + name = "cairomm-1.8.4"; src = fetchurl { url = "http://cairographics.org/releases/${name}.tar.gz"; - sha256 = "0rcbkk16yj9k1y491ms5j6f9z5wrvv4qkd7wbx44nziwhw6hc0qx"; + sha256 = "1wf8lvijrk5q5jhxxxfy2yjp97azwdyxfb7kfs8d14wgmzcwd3m2"; }; - buildInputs = [pkgconfig]; + buildInputs = [ pkgconfig ]; propagatedBuildInputs = [ cairo x11 fontconfig freetype libsigcxx ]; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index f3fa4c98ca119..85314b725afd9 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -8,7 +8,7 @@ let sha256 = "1j742d22ablcgxfxa3hcwf5bq6bd1pba7fiwc3dvnjvcdb0k32ln"; }; - configureFlags = "--localstatedir=/var --with-session-socket-dir=/tmp"; + configureFlags = "--localstatedir=/var --sysconfdir=/etc --with-session-socket-dir=/tmp"; in rec { @@ -19,10 +19,13 @@ in rec { inherit src configureFlags; - patchPhase = '' - sed -i '/mkinstalldirs.*localstatedir/d' bus/Makefile.in - sed -i '/SUBDIRS/s/ tools//' Makefile.in - ''; + patchPhase = + '' + sed -i '/mkinstalldirs.*localstatedir/d' bus/Makefile.in + sed -i '/SUBDIRS/s/ tools//' Makefile.in + ''; + + installFlags = "sysconfdir=$(out)/etc"; }; tools = stdenv.mkDerivation { @@ -39,10 +42,11 @@ in rec { makeFlags = "DBUS_DAEMONDIR=${daemon}/bin"; - patchPhase = '' - sed -i 's@ $(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in - substituteInPlace tools/Makefile.in --replace 'install-localstatelibDATA:' 'disabled:' - ''; + patchPhase = + '' + sed -i 's@ $(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in + substituteInPlace tools/Makefile.in --replace 'install-localstatelibDATA:' 'disabled:' + ''; }; # I'm too lazy to separate daemon and libs now. diff --git a/pkgs/development/libraries/dbus/temp.nix b/pkgs/development/libraries/dbus/temp.nix deleted file mode 100644 index 85314b725afd9..0000000000000 --- a/pkgs/development/libraries/dbus/temp.nix +++ /dev/null @@ -1,58 +0,0 @@ -{stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true}: - -let - version = "1.2.16"; - - src = fetchurl { - url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; - sha256 = "1j742d22ablcgxfxa3hcwf5bq6bd1pba7fiwc3dvnjvcdb0k32ln"; - }; - - configureFlags = "--localstatedir=/var --sysconfdir=/etc --with-session-socket-dir=/tmp"; - -in rec { - - libs = stdenv.mkDerivation { - name = "dbus-library-" + version; - - buildInputs = [pkgconfig expat]; - - inherit src configureFlags; - - patchPhase = - '' - sed -i '/mkinstalldirs.*localstatedir/d' bus/Makefile.in - sed -i '/SUBDIRS/s/ tools//' Makefile.in - ''; - - installFlags = "sysconfdir=$(out)/etc"; - }; - - tools = stdenv.mkDerivation { - name = "dbus-tools-" + version; - - inherit src configureFlags; - - buildInputs = [pkgconfig expat libs] - ++ stdenv.lib.optionals useX11 [libX11 libICE libSM]; - - postConfigure = "cd tools"; - - NIX_LDFLAGS = "-ldbus-1"; - - makeFlags = "DBUS_DAEMONDIR=${daemon}/bin"; - - patchPhase = - '' - sed -i 's@ $(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in - substituteInPlace tools/Makefile.in --replace 'install-localstatelibDATA:' 'disabled:' - ''; - }; - - # I'm too lazy to separate daemon and libs now. - daemon = libs; - - # FIXME TODO - # After merger it will be better to correct upstart-job instead. - outPath = daemon.outPath; -} diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 526769fd9cf2a..1f1074096839e 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -1,22 +1,24 @@ {stdenv, fetchurl, freetype, expat}: -stdenv.mkDerivation { - name = "fontconfig-2.6.0"; +stdenv.mkDerivation rec { + name = "fontconfig-2.7.3"; src = fetchurl { - url = http://fontconfig.org/release/fontconfig-2.6.0.tar.gz; - sha256 = "19fqr2vh7rzpqfh2lnkymh7q5pxn9r4w2z35lh36crp5l3m3k9m9"; + url = "http://fontconfig.org/release/${name}.tar.gz"; + sha256 = "0l5hjifapv4v88a204ixg6w6xly81cji2cr65znra0vbbkqvz3xs"; }; buildInputs = [freetype]; propagatedBuildInputs = [expat]; # !!! shouldn't be necessary, but otherwise pango breaks - preConfigure = '' - configureFlags="--with-confdir=$out/etc/fonts --disable-docs --with-default-fonts=" - ''; + configureFlags = "--with-confdir=/etc/fonts --with-cache-dir=/var/cache/fontconfig --disable-docs --with-default-fonts="; + + # Don't try to write to /etc/fonts or /var/cache/fontconfig at install time. + installFlags = "CONFDIR=$(out)/etc/fonts RUN_FC_CACHE_TEST=false fc_cachedir=$(TMPDIR)/dummy"; meta = { description = "A library for font customization and configuration"; homepage = http://fontconfig.org/; + license = "bsd"; }; } diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index d4ecebca46c26..0bf2db03cd820 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -1,17 +1,29 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl + +, # FreeType supports hinting using a TrueType bytecode interpreter, + # as well as sub-pixel rendering. These are patented by Apple and + # Microsoft, respectively, so they are disabled by default. This + # option allows them to be enabled. See + # http://www.freetype.org/patents.html. + useEncumberedCode ? false +}: stdenv.mkDerivation rec { - name = "freetype-2.3.9"; + name = "freetype-2.3.11"; src = fetchurl { url = "mirror://sourceforge/freetype/${name}.tar.bz2"; - sha256 = "1dia4j01aqdcrkpfkcniswcrccdx4jx2p3hyhbh76kchx6y3782i"; + sha256 = "1j9f3q7vkdhlcxmfhkkyvxmniih2gcsb428v73mfk88qc0g3n0wa"; }; configureFlags = "--disable-static"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString useEncumberedCode + "-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING=1 -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER=1"; + meta = { description = "A font rendering engine"; homepage = http://www.freetype.org/; + license = "GPLv2+"; # or the FreeType License (BSD + advertising clause) }; } diff --git a/pkgs/development/libraries/gtk+/2.18.x.nix b/pkgs/development/libraries/gtk+/2.18.x.nix index fd5c290838418..22efef4255f57 100644 --- a/pkgs/development/libraries/gtk+/2.18.x.nix +++ b/pkgs/development/libraries/gtk+/2.18.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, atk, pango, libtiff, libjpeg , libpng, cairo, perl, jasper, xlibs , xineramaSupport ? true -, cupsSupport ? true, cups ? null, openssl ? null +, cupsSupport ? true, cups ? null }: assert xineramaSupport -> xlibs.libXinerama != null; -assert cupsSupport -> cups != null && openssl != null; +assert cupsSupport -> cups != null; stdenv.mkDerivation rec { name = "gtk+-2.18.3"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ xlibs.xlibs glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr ] ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama - ++ stdenv.lib.optionals cupsSupport [ cups openssl ]; + ++ stdenv.lib.optionals cupsSupport [ cups ]; passthru = { inherit libtiff libjpeg libpng; }; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 8432c5675f4ce..53c66ae7c151d 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,17 +1,18 @@ -{stdenv, fetchurl, pkgconfig, pthread_stubs}: +{stdenv, fetchurl, pkgconfig, libpthreadstubs}: stdenv.mkDerivation rec { - name = "libdrm-2.4.9"; + name = "libdrm-2.4.15"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "18i1c4pcy2db2alali1yxg1s72vdpikivahmbrp7wf204kn236zd"; + sha256 = "1pm7iddv3yjwvqmlbdmj9m55bmkfcfzq0wvqpgx4gkmdjfd8kzxw"; }; - buildInputs = [ pkgconfig pthread_stubs ]; + buildInputs = [ pkgconfig libpthreadstubs ]; meta = { homepage = http://dri.freedesktop.org/libdrm/; description = "Library for accessing the kernel's Direct Rendering Manager"; + license = "bsd"; }; } diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 87bced1d17c86..d68cb73b2b5e6 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -4,17 +4,17 @@ stdenv.mkDerivation rec { - name = "libgsf-1.14.9"; + name = "libgsf-1.14.16"; src = fetchurl { url = "http://ftp.gnome.org/pub/gnome/sources/libgsf/1.14/${name}.tar.bz2"; - sha256 = "1mkw60052sd6k9sq8ppz4yra0s3sdinngqi6bcmrj9977zk8yqfi"; + sha256 = "0249n2hgrcnzphinaxng0cpn7afchg84l4ka4wka9kyv3g58zz8i"; }; - buildInputs = [ - perl perlXMLParser pkgconfig libxml2 glib gettext bzip2 - gnomevfs libbonobo python intltool - ]; + buildInputs = + [ perl perlXMLParser pkgconfig gettext bzip2 gnomevfs python intltool ]; + + propagatedBuildInputs = [ glib libxml2 libbonobo ]; doCheck = true; diff --git a/pkgs/development/libraries/libjpeg/builder.sh b/pkgs/development/libraries/libjpeg/builder.sh deleted file mode 100644 index 923f4f8397445..0000000000000 --- a/pkgs/development/libraries/libjpeg/builder.sh +++ /dev/null @@ -1,25 +0,0 @@ -source $stdenv/setup - -preConfigure() { - # Workarounds for the ancient libtool shipped by libjpeg. - ln -s $libtool/bin/libtool . - cp $libtool/share/libtool/config.guess . - cp $libtool/share/libtool/config.sub . -} - -preInstall() { - mkdir $out - mkdir $out/bin - mkdir $out/lib - mkdir $out/include - mkdir $out/man - mkdir $out/man/man1 -} - -patchPhase() { - for i in $patches; do - patch < $i - done -} - -genericBuild \ No newline at end of file diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index fb92fe995b664..6e4ad9a0971b3 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -1,29 +1,18 @@ -{stdenv, fetchurl, libtool, static ? false, ...}: +{ stdenv, fetchurl, libtool, static ? false }: stdenv.mkDerivation { - name = "libjpeg-6b"; - - builder = ./builder.sh; + name = "libjpeg-7"; src = fetchurl { - url = http://www.ijg.org/files/jpegsrc.v6b.tar.gz; - md5 = "dbd5f3b47ed13132f04c685d608a7547"; + url = http://www.ijg.org/files/jpegsrc.v7.tar.gz; + sha256 = "1gvy6f83pskxrxwnxqah3g9mhnlgi6aph39b99609gn50ri8ddsh"; }; - inherit libtool; - configureFlags = "--enable-shared ${if static then " --enable-static" else ""}"; - - # Required for building of dynamic libraries on Darwin. - patches = [ - (fetchurl { - url = http://svn.macports.org/repository/macports/trunk/dports/graphics/jpeg/files/patch-ltconfig; - md5 = "e6725fa4a09aa1de4ca75343fd0f61d5"; - }) - (fetchurl { - url = http://svn.macports.org/repository/macports/trunk/dports/graphics/jpeg/files/patch-ltmain.sh; - #md5 = "489986ad8e7a93aef036766b25f321d5"; - md5 = "092a12aeb0c386dd7dae059109d950ba"; - }) - ]; + + meta = { + homepage = http://www.ijg.org/; + description = "A library that implements the JPEG image file format"; + license = "free"; + }; } diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 256993b996800..87148e76059a9 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -3,11 +3,11 @@ assert zlib != null; stdenv.mkDerivation rec { - name = "libpng-1.2.35"; + name = "libpng-1.2.40"; src = fetchurl { - url = mirror://sourceforge/libpng/libpng-1.2.35.tar.bz2; - md5 = "b8b8d09adf6bee2c5902c8e54c4f2e68"; + url = "mirror://sourceforge/libpng/${name}.tar.gz"; + md5 = "a2f6808735bf404967f81519a967fb2a"; }; propagatedBuildInputs = [zlib]; @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { meta = { description = "The official reference implementation for the PNG file format"; homepage = http://www.libpng.org/pub/png/libpng.html; + license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt }; } diff --git a/pkgs/development/libraries/libtiff/builder.sh b/pkgs/development/libraries/libtiff/builder.sh deleted file mode 100644 index dd1bdebd39c16..0000000000000 --- a/pkgs/development/libraries/libtiff/builder.sh +++ /dev/null @@ -1,5 +0,0 @@ -source $stdenv/setup - -configureFlags="--with-DIR_MAN=$out/man --with-ZIP --with-JPEG" - -genericBuild diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 3a47356d1de56..e2a25583326bd 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,14 +1,18 @@ -{stdenv, fetchurl, zlib, libjpeg}: - -assert zlib != null && libjpeg != null; +{ stdenv, fetchurl, zlib, libjpeg }: stdenv.mkDerivation { - name = "libtiff-3.8.2"; - builder = ./builder.sh; + name = "libtiff-3.9.1"; + src = fetchurl { - url = ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.8.2.tar.gz; - md5 = "fbb6f446ea4ed18955e2714934e5b698"; + url = ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.9.1.tar.gz; + sha256 = "168yssav47xih2y17m7psj4k6ngnfai300bbfznc75hn3crxfdil"; }; + propagatedBuildInputs = [zlib libjpeg]; - inherit zlib libjpeg; + + meta = { + description = "Library and utilities for working with the TIFF image file format"; + homepage = http://www.libtiff.org/; + license = "bsd"; + }; } diff --git a/pkgs/development/libraries/libxml2/2.7.4.nix b/pkgs/development/libraries/libxml2/2.7.4.nix deleted file mode 100644 index d126aa8258158..0000000000000 --- a/pkgs/development/libraries/libxml2/2.7.4.nix +++ /dev/null @@ -1,27 +0,0 @@ -{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true}: - -assert pythonSupport -> python != null; - -stdenv.mkDerivation { - name = "libxml2-2.7.4"; - - src = fetchurl { - url = ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.4.tar.gz; - sha256 = "1psk9r69z02cmjpbixs89qj0zprfyi6xc598j51cc0gah0h3wq03"; - }; - - configureFlags = '' - ${if pythonSupport then "--with-python=${python}" else ""} - ''; - - propagatedBuildInputs = [zlib]; - - setupHook = ./setup-hook.sh; - - passthru = {inherit pythonSupport;}; - - meta = { - homepage = http://xmlsoft.org/; - description = "A XML parsing library for C"; - }; -} diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index d1b151a3fee20..f3c9c6ca652fd 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,13 +1,13 @@ -{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true, ...}: +{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true}: assert pythonSupport -> python != null; stdenv.mkDerivation { - name = "libxml2-2.7.3"; + name = "libxml2-2.7.6"; src = fetchurl { - url = ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.3.tar.gz; - sha256 = "01bgxgvl0gcx97zmlz9f2ivgbiv86kqbs9l93n2cbxywv1pc4jd5"; + url = ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.6.tar.gz; + sha256 = "0n61rqqfiv0m64p01cwx205i6hb0mmzf7r0ya40s4fiqd2nhkkg0"; }; configureFlags = '' @@ -23,5 +23,6 @@ stdenv.mkDerivation { meta = { homepage = http://xmlsoft.org/; description = "A XML parsing library for C"; + license = "bsd"; }; } diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 5eccf40df0120..84732891cd192 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libxml2, ...}: -stdenv.mkDerivation { - name = "libxslt-1.1.24"; +stdenv.mkDerivation rec { + name = "libxslt-1.1.26"; src = fetchurl { - url = ftp://xmlsoft.org/libxml2/libxslt-1.1.24.tar.gz; - sha256 = "c0c10944841e9a79f29d409c6f8da0d1b1af0403eb3819c82c788dfa6a180b3e"; + url = "ftp://xmlsoft.org/libxml2/${name}.tar.gz"; + sha256 = "1c9xdv39jvq1hp16gsbi56hbz032dmqyy0fpi4ls1y3152s55pam"; }; buildInputs = [libxml2]; @@ -18,5 +18,6 @@ stdenv.mkDerivation { meta = { homepage = http://xmlsoft.org/XSLT/; description = "A C library and tools to do XSL transformations"; + license = "bsd"; }; } diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index d7807a5b11240..ad7ea7ecc5d72 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,26 +1,27 @@ -{stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat}: +{ stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat }: if stdenv.system != "i686-linux" && stdenv.system != "x86_64-linux" && stdenv.system != "i686-darwin" && stdenv.system != "i686-freebsd" then throw "unsupported platform for Mesa" else stdenv.mkDerivation { - name = "mesa-7.4.1"; + name = "mesa-7.5.2"; src = fetchurl { - url = mirror://sourceforge/mesa3d/MesaLib-7.4.1.tar.bz2; - md5 = "423260578b653818ba66c2fcbde6d7ad"; + url = ftp://ftp.freedesktop.org/pub/mesa/7.5.2/MesaLib-7.5.2.tar.bz2; + md5 = "94e47a499f1226803869c2e37a6a8e3a"; }; - buildInputs = [ - pkgconfig expat x11 libdrm xlibs.glproto - xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto - ]; + buildInputs = + [ pkgconfig expat x11 libdrm xlibs.glproto + xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto + ]; - passthru = {inherit libdrm;}; + passthru = { inherit libdrm; }; meta = { description = "An open source implementation of OpenGL"; homepage = http://www.mesa3d.org/; + license = "bsd"; }; } diff --git a/pkgs/development/libraries/policykit/default.nix b/pkgs/development/libraries/policykit/default.nix index 90ab6fb45bbde..067e8d50e22e4 100644 --- a/pkgs/development/libraries/policykit/default.nix +++ b/pkgs/development/libraries/policykit/default.nix @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig glib dbus.libs dbus_glib expat pam intltool - gettext libxslt - ]; + [ pkgconfig glib dbus_glib pam intltool gettext libxslt ]; + + propagatedBuildInputs = [ expat dbus.libs ]; configureFlags = "--localstatedir=/var --sysconfdir=/etc"; diff --git a/pkgs/development/libraries/pthread-stubs/default.nix b/pkgs/development/libraries/pthread-stubs/default.nix deleted file mode 100644 index 8a007b0f96872..0000000000000 --- a/pkgs/development/libraries/pthread-stubs/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{stdenv, fetchurl}: -stdenv.mkDerivation { - name = "pthread-stubs-0.1"; - src = fetchurl { - url = http://xcb.freedesktop.org/dist/libpthread-stubs-0.1.tar.bz2; - sha256 = "0raxl73kmviqinp00bfa025d0j4vmfjjcvfn754mi60mw48swk80"; - }; -} diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index e1bc3f8974187..64b984c3f3af9 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -2,7 +2,7 @@ , xftSupport ? true, libXft ? null , xrenderSupport ? true, libXrender ? null , xrandrSupport ? true, libXrandr ? null, randrproto ? null -, xineramaSupport ? true, libXinerama ? null, xineramaproto ? null +, xineramaSupport ? true, libXinerama ? null , cursorSupport ? true, libXcursor ? null , threadSupport ? true , mysqlSupport ? true, mysql ? null @@ -44,7 +44,7 @@ stdenv.mkDerivation { ${if xrandrSupport then "-xrandr -L${libXrandr}/lib -I${libXrandr}/include -I${randrproto}/include" else "-no-xrandr"} - ${if xineramaSupport then "-xinerama -L${libXinerama}/lib -I${xineramaproto}/include" else "-no-xinerama"} + ${if xineramaSupport then "-xinerama -L${libXinerama}/lib -I${libXinerama}/include" else "-no-xinerama"} ${if cursorSupport then "-L${libXcursor}/lib -I${libXcursor}/include" else ""} ${if mysqlSupport then "-qt-sql-mysql -L${mysql}/lib/mysql -I${mysql}/include/mysql" else ""} ${if xftSupport then "-xft diff --git a/pkgs/development/tools/misc/icon-naming-utils/default.nix b/pkgs/development/tools/misc/icon-naming-utils/default.nix index be1bc9691c8ef..7a03eb7b1280c 100644 --- a/pkgs/development/tools/misc/icon-naming-utils/default.nix +++ b/pkgs/development/tools/misc/icon-naming-utils/default.nix @@ -1,20 +1,23 @@ {stdenv, fetchurl, perl, XMLSimple}: -stdenv.mkDerivation { - name = "icon-naming-utils-0.8.7"; +stdenv.mkDerivation rec { + name = "icon-naming-utils-0.8.90"; src = fetchurl { - url = http://tango.freedesktop.org/releases/icon-naming-utils-0.8.7.tar.gz; - sha256 = "1lj0lffdg7fjfinhrn0vsq1kj010dxlxlix4jfc969j6l3k9rd0w"; + url = "http://tango.freedesktop.org/releases/${name}.tar.gz"; + sha256 = "071fj2jm5kydlz02ic5sylhmw6h2p3cgrm3gwdfabinqkqcv4jh4"; }; buildInputs = [perl XMLSimple]; - postInstall = " - # Add XML::Simple to the runtime search path. - substituteInPlace $out/libexec/icon-name-mapping \\ - --replace '/bin/perl' '/bin/perl -I${XMLSimple}/lib/perl5/site_perl'; - ensureDir $out/lib - ln -s $out/share/pkgconfig $out/lib/pkgconfig # WTF? - "; + postInstall = + '' + # Add XML::Simple to the runtime search path. + substituteInPlace $out/libexec/icon-name-mapping \ + --replace '/bin/perl' '/bin/perl -I${XMLSimple}/lib/perl5/site_perl' + ''; + + meta = { + homepage = http://tango.freedesktop.org/Standard_Icon_Naming_Specification; + }; } diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 78b159bea9d8b..2f164802b6ce1 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,38 +1,45 @@ -{stdenv, fetchurl, zlib, libjpeg, libpng, libtiff, pam, openssl}: +{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl, dbus }: -let version = "1.3.10"; in +let version = "1.4.1"; in stdenv.mkDerivation { name = "cups-${version}"; src = fetchurl { url = "http://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2"; - sha256 = "0rmm1dj8ha8d5c9lpdsfpfyw6l6lnkxl36xlxqdrjnm0lr2sa0cp"; + sha256 = "1fnkq993hr8l87x6f7a7wik2spac3f7nn4wksrvwk690r8a6zxng"; }; - buildInputs = [zlib libjpeg libpng libtiff pam openssl]; - - preConfigure = '' - configureFlags="--localstatedir=/var" - ''; - - preBuild = '' - makeFlagsArray=(INITDIR=$out/etc/rc.d) - ''; - - # Awful hack: CUPS' `make install' wants to write in /var, but it - # can't. So redirect it with a BUILDROOT (=DESTDIR). - preInstall = '' - installFlagsArray=(BUILDROOT=$out/destdir) - ''; - - postInstall = '' - mv $out/destdir/$out/* $out - rm -rf $out/destdir - ''; # */ + patches = + [ (fetchurl { + url = http://www.cups.org/strfiles/3332/0001-Fixed-side_cb-function-declaration-in-usb-unix.c.patch; + sha256 = "0h8fhhpzp7xngnc428040jv09yvpz5dxb9hw6sv67lnvb03fncnw"; + }) + ]; + + buildInputs = [ pkgconfig zlib libjpeg libpng libtiff pam dbus ]; + + propagatedBuildInputs = [ openssl ]; + + configureFlags = "--localstatedir=/var --enable-dbus"; # --with-dbusdir + + installFlags = + [ # Don't try to write in /var at build time. + "CACHEDIR=$(TMPDIR)/dummy" + "LOGDIR=$(TMPDIR)/dummy" + "REQUESTS=$(TMPDIR)/dummy" + "STATEDIR=$(TMPDIR)/dummy" + # Idem for /etc. + "PAMDIR=$(out)/etc/pam.d" + "DBUSDIR=$(out)/etc/dbus-1" + "INITDIR=$(out)/etc/rc.d" + # Work around a Makefile bug. + "CUPS_PRIMARY_SYSTEM_GROUP=root" + ]; meta = { homepage = http://www.cups.org/; description = "A standards-based printing system for UNIX"; + license = "GPLv2"; # actually LGPL for the library and GPL for the rest }; } diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix index ad9f5551afe70..daabf99d543b9 100644 --- a/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-lib/default.nix @@ -1,17 +1,20 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "alsa-lib-1.0.19"; +stdenv.mkDerivation rec { + name = "alsa-lib-1.0.21a"; + src = fetchurl { - url = ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.19.tar.bz2; - sha256 = "11i898dc6qbachn046gl6dg6g7bl2k8crddl97f3z5i57bcjdvij"; - }; + url = "ftp://ftp.alsa-project.org/pub/lib/${name}.tar.bz2"; + sha256 = "0x00sxvf1271vfg829yabaj0xkm4xgvk5vvwcq4qnhn5mnphkkm6"; + }; + configureFlags = "--disable-xmlto"; + # Fix pcm.h file in order to prevent some compilation bugs - patchPhase = '' + postPatch = '' sed -i -e 's|//int snd_pcm_mixer_element(snd_pcm_t \*pcm, snd_mixer_t \*mixer, snd_mixer_elem_t \*\*elem);|/\*int snd_pcm_mixer_element(snd_pcm_t \*pcm, snd_mixer_t \*mixer, snd_mixer_elem_t \*\*elem);\*/|' include/pcm.h - unset patchPhase; patchPhase ''; + meta = { description = "ALSA, the Advanced Linux Sound Architecture libraries"; diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index cca6a75ce0a22..8eda24de57731 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -1,12 +1,15 @@ {stdenv, fetchurl, alsaLib, gettext, ncurses}: -stdenv.mkDerivation { - name = "alsa-utils-1.0.19"; +stdenv.mkDerivation rec { + name = "alsa-utils-1.0.21"; + src = fetchurl { - url = ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.19.tar.bz2; - sha256 = "1bcchd5nwgb2hy0z9c6jxbqlzirkh6wvxv6nldjcwmvqmvsj8j8z"; + url = "ftp://ftp.alsa-project.org/pub/utils/${name}.tar.bz2"; + sha256 = "19jpqfrlc13yxvw3vzdw6cgdwjd97spsmn348v5181wkid8lkwvd"; }; + buildInputs = [ alsaLib gettext ncurses ]; + configureFlags = "--disable-xmlto"; meta = { diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index f72b27f2c7a2b..b87802e078f68 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -2,7 +2,7 @@ let - versionNumber = "185.18.36"; + versionNumber = "190.42"; in @@ -15,12 +15,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run"; - sha256 = "1i3j7p8aq9p21hr8j4dxab82dsmghbhq15rpzr8bry6jgs24jplq"; + sha256 = "0wcj3fwqgh5484h9slhhpkz5qsxfx9kwk1nv3fmw58agmkdbalg8"; } 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}-pkg0.run"; - sha256 = "123cr006y54329sg5vzrgzinw0w9krq0g9sf0aqcw0av203mn5iy"; + sha256 = "0x93cjfhz6izb730c4iwrvdnqi2dlzbkw6r6hrbdcad15cwsjr45"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 74bfc27aae6c1..397066ae06698 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -8,513 +8,463 @@ let xorg = rec { applewmproto = (stdenv.mkDerivation ((if overrides ? applewmproto then overrides.applewmproto else x: x) { - name = "applewmproto-1.0.3"; + name = "applewmproto-1.4.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/applewmproto-1.0.3.tar.bz2; - sha256 = "0l2d3wmgprs5gl479ba2yw9vj1q3m8rhri82k0vryd9ildzc0f59"; + url = mirror://xorg/X11R7.5/src/everything/applewmproto-1.4.1.tar.bz2; + sha256 = "06fyixmx36qac2qqwmra3l9xr570rankm9kzmk0mgqyhgldrw1h8"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - appres = (stdenv.mkDerivation ((if overrides ? appres then overrides.appres else x: x) { - name = "appres-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/appres-1.0.1.tar.bz2; - sha256 = "0qmr5sdbj4alzf3p8lxb8348y7zdmsjdp20c8biwx39b40xgizhm"; - }; - buildInputs = [pkgconfig libX11 libXt ]; - })) // {inherit libX11 libXt ;}; - bdftopcf = (stdenv.mkDerivation ((if overrides ? bdftopcf then overrides.bdftopcf else x: x) { - name = "bdftopcf-1.0.1"; + name = "bdftopcf-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/bdftopcf-1.0.1.tar.bz2; - sha256 = "1lq5x0kvgwlzdgfhi8sbbchzd1y1nmzdqgq9laysx08p6smlbama"; + url = mirror://xorg/X11R7.5/src/everything/bdftopcf-1.0.2.tar.bz2; + sha256 = "0sx09m677xjvq88sg4yq21y79zck47bvpzanpll35z9psq6py08i"; }; buildInputs = [pkgconfig libXfont ]; })) // {inherit libXfont ;}; bigreqsproto = (stdenv.mkDerivation ((if overrides ? bigreqsproto then overrides.bigreqsproto else x: x) { - name = "bigreqsproto-1.0.2"; + name = "bigreqsproto-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/bigreqsproto-1.0.2.tar.bz2; - sha256 = "1vmda2412s5yvawx2xplrbzcghnmqin54r1l352ycy25lac01nih"; + url = mirror://xorg/X11R7.5/src/everything/bigreqsproto-1.1.0.tar.bz2; + sha256 = "1g8725413gz4lj4cc8svqvk4b4r9alj84127xslv16as7hny2r28"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - bitmap = (stdenv.mkDerivation ((if overrides ? bitmap then overrides.bitmap else x: x) { - name = "bitmap-1.0.3"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/bitmap-1.0.3.tar.bz2; - sha256 = "0hawhldsa0647a5x2hy5frf6k2wcpwq1n8pf6npgj6dg30snfgw6"; - }; - buildInputs = [pkgconfig libXaw libX11 xbitmaps libXmu libXt ]; - })) // {inherit libXaw libX11 xbitmaps libXmu libXt ;}; - compositeproto = (stdenv.mkDerivation ((if overrides ? compositeproto then overrides.compositeproto else x: x) { - name = "compositeproto-0.4"; + name = "compositeproto-0.4.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/compositeproto-0.4.tar.bz2; - sha256 = "00q0wc8skfjy7c9dzngvmi99i29bh68715wrdw7m9dxjcg5d24v0"; + url = mirror://xorg/X11R7.5/src/everything/compositeproto-0.4.1.tar.bz2; + sha256 = "1139c3nqrwx9fca3b4xrf07jdl31g25dbq5d7981c50yfdv4ax72"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; damageproto = (stdenv.mkDerivation ((if overrides ? damageproto then overrides.damageproto else x: x) { - name = "damageproto-1.1.0"; + name = "damageproto-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/damageproto-1.1.0.tar.bz2; - sha256 = "07b41ninycfm5sgzpjsa168dnm1g55c2mzzgigvwvs9mr3x889lx"; + url = mirror://xorg/X11R7.5/src/everything/damageproto-1.2.0.tar.bz2; + sha256 = "13zfd4qni9sw1ym8zd95sk2a39nh50rpwmsnzpbdksif19vm00m5"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; dmxproto = (stdenv.mkDerivation ((if overrides ? dmxproto then overrides.dmxproto else x: x) { - name = "dmxproto-2.2.2"; + name = "dmxproto-2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/dmxproto-2.2.2.tar.bz2; - sha256 = "1qpw6lp4925zwmkp48b6wsy84d21872i6x2dr8rzfn7csp4xk9ma"; + url = mirror://xorg/X11R7.5/src/everything/dmxproto-2.3.tar.bz2; + sha256 = "1c03qkb7gj1fd84wz5c8kxanvmfpgx06r3j6i4s9wd8z7aj2r21s"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; dri2proto = (stdenv.mkDerivation ((if overrides ? dri2proto then overrides.dri2proto else x: x) { - name = "dri2proto-2.0"; + name = "dri2proto-2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/proto/dri2proto-2.0.tar.bz2; - sha256 = "1r59dpxinlssq0iangbdxng0cjp88g8nx0w3qh8hdrvzdplsfm0r"; + url = mirror://xorg/X11R7.5/src/everything/dri2proto-2.1.tar.bz2; + sha256 = "0b8jjlw2dk5nx4jgvwvwsysswar625vp3wmaqc2g1f4gcp3zfcrb"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; encodings = (stdenv.mkDerivation ((if overrides ? encodings then overrides.encodings else x: x) { - name = "encodings-1.0.2"; + name = "encodings-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/encodings-1.0.2.tar.bz2; - sha256 = "1b2fdxfvqb0gbg4pz8anp9rwnbg2xj3d4b8cbc46rjdvcrxi06bd"; - }; - buildInputs = [pkgconfig mkfontscale ]; - })) // {inherit mkfontscale ;}; - - evieext = (stdenv.mkDerivation ((if overrides ? evieext then overrides.evieext else x: x) { - name = "evieext-1.0.2"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/evieext-1.0.2.tar.bz2; - sha256 = "09fijha8ac0iw7lbc75912jwhm5k19ypm73zj8akf23hjwx1318b"; + url = mirror://xorg/X11R7.5/src/everything/encodings-1.0.3.tar.bz2; + sha256 = "0lqgp2rmygn0dhmjy658cyv6mq2g7a88z7srfb2mmq7b99npdn87"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; fixesproto = (stdenv.mkDerivation ((if overrides ? fixesproto then overrides.fixesproto else x: x) { - name = "fixesproto-4.0"; + name = "fixesproto-4.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/fixesproto-4.0.tar.bz2; - sha256 = "13xhrva17vcg1zdz6kba5g5jzkf43z1ifwfsg1ndnll1rhf9gzmk"; + url = mirror://xorg/X11R7.5/src/everything/fixesproto-4.1.1.tar.bz2; + sha256 = "1vv4y5zjlh2x6vbxx1nj770aznrbb1amr57q8wwd1fylda8k4ap7"; }; - buildInputs = [pkgconfig ]; - })) // {inherit ;}; + buildInputs = [pkgconfig xextproto ]; + })) // {inherit xextproto ;}; fontadobe100dpi = (stdenv.mkDerivation ((if overrides ? fontadobe100dpi then overrides.fontadobe100dpi else x: x) { - name = "font-adobe-100dpi-1.0.0"; + name = "font-adobe-100dpi-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-adobe-100dpi-1.0.0.tar.bz2; - sha256 = "06cs5q4hy255i5b64q0cgcapv46kgc315b7jmwjs5j952qx1nv7i"; + url = mirror://xorg/X11R7.5/src/everything/font-adobe-100dpi-1.0.1.tar.bz2; + sha256 = "0b5m5iwc6925ysf0ljghx5znh9nkl792l77i26spdyzqsslbqhm7"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; - })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; + 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.0"; + name = "font-adobe-75dpi-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-adobe-75dpi-1.0.0.tar.bz2; - sha256 = "0fb32yyqf4mf93bn9a0qbzm9zbl3sxkhc0ipy9az7r7mw2z4a9yn"; + url = mirror://xorg/X11R7.5/src/everything/font-adobe-75dpi-1.0.1.tar.bz2; + sha256 = "0wczvzn5pc3c46xxp4328s207giisy4vwwv5if574w3bs9jigrad"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; - })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; + 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.1"; + name = "font-adobe-utopia-100dpi-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-adobe-utopia-100dpi-1.0.1.tar.bz2; - sha256 = "1zmmm430rwgv0cr80ybl6bk9qzr697lwh253qwxv2sf1f2mf2hqr"; + url = mirror://xorg/X11R7.5/src/everything/font-adobe-utopia-100dpi-1.0.2.tar.bz2; + sha256 = "0plmfm3x5lsaa27slslw0sxx4jv9wb6zwwv2n8r957sq15akz36x"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; - })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; + 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.1"; + name = "font-adobe-utopia-75dpi-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-adobe-utopia-75dpi-1.0.1.tar.bz2; - sha256 = "12bhr82dsd9iz50kszppghf22fpyjcadrxd0plxpwwmw9ccy5m7b"; + url = mirror://xorg/X11R7.5/src/everything/font-adobe-utopia-75dpi-1.0.2.tar.bz2; + sha256 = "0mv5pa2x7xvz8cjkcfihnfnl98ljx8bbxdb26qxy2wsvbfxa8g1v"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; - })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; + 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.1"; + name = "font-adobe-utopia-type1-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-adobe-utopia-type1-1.0.1.tar.bz2; - sha256 = "1p604j44vqfp7iv4a7p38vi6d1qk26grmnkdsz1dapr7zz475ip9"; + url = mirror://xorg/X11R7.5/src/everything/font-adobe-utopia-type1-1.0.2.tar.bz2; + sha256 = "0cz2aqknq4r923v77s9r61bxvxi1jy7igz2c3ff23xjawi92fpwc"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; + 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.1"; + name = "font-alias-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-alias-1.0.1.tar.bz2; - sha256 = "1dl99xmdbgwssd4zgnipc4b4l5g9s2qc08wx29bdif946bb61nvp"; + url = mirror://xorg/X11R7.5/src/everything/font-alias-1.0.2.tar.bz2; + sha256 = "0w42ndi73wiyrc9zj7g0syxnfq2x2cncjpchm5pdnpihz7rxd2s3"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; fontarabicmisc = (stdenv.mkDerivation ((if overrides ? fontarabicmisc then overrides.fontarabicmisc else x: x) { - name = "font-arabic-misc-1.0.0"; + name = "font-arabic-misc-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-arabic-misc-1.0.0.tar.bz2; - sha256 = "155wyy6vsxha3lx9cvw22pscsdc3iljsgyh6zqpyl19qyfixzsch"; + url = mirror://xorg/X11R7.5/src/everything/font-arabic-misc-1.0.1.tar.bz2; + sha256 = "0q3gxbk4wcj1cpw1fhs66vf7ddar8fmkml47g8rlv127zmd31c7l"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; - })) // {inherit bdftopcf mkfontdir mkfontscale ;}; + 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.0"; + name = "font-bh-100dpi-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-bh-100dpi-1.0.0.tar.bz2; - sha256 = "0jpfrxwdx24ib784j6k6qbi6zvy6svyva6gda8pj98krfmvi32mf"; + url = mirror://xorg/X11R7.5/src/everything/font-bh-100dpi-1.0.1.tar.bz2; + sha256 = "15rk3k1w12pidz9373y388zqmbrmw13pmj2aydk35689gd46hvf4"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; - })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; + 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.0"; + name = "font-bh-75dpi-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-bh-75dpi-1.0.0.tar.bz2; - sha256 = "1gq55j00g7fqnypxy6f0wvhz5l16056sdysmbp3qk4yc82s6g567"; + url = mirror://xorg/X11R7.5/src/everything/font-bh-75dpi-1.0.1.tar.bz2; + sha256 = "0h4xnrbznb2vyy950h9iq0fyxgwpdkw5pb2l424g0sgifylpacca"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; - })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; + 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.0"; + name = "font-bh-lucidatypewriter-100dpi-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2; - sha256 = "04vh9mccnh517q42w65k89pz3jd6szim3hazydm7n0wilp5pvm1n"; + url = mirror://xorg/X11R7.5/src/everything/font-bh-lucidatypewriter-100dpi-1.0.1.tar.bz2; + sha256 = "1acd04cd2ls7c1gihywa2hf67ijm7iz4q5c7q9wd9yx3wp2gfml1"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; - })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; + 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.0"; + name = "font-bh-lucidatypewriter-75dpi-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2; - sha256 = "0im03ms6bx1947fkdarrdzzm8lq69pz5502n89cccj9sadpz7wjh"; + url = mirror://xorg/X11R7.5/src/everything/font-bh-lucidatypewriter-75dpi-1.0.1.tar.bz2; + sha256 = "0h9qxgb7v6i12qjyc98ry3ym52a602kkpsvycjb6r4f62icrrzr0"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; - })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; + 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.0"; + name = "font-bh-ttf-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-bh-ttf-1.0.0.tar.bz2; - sha256 = "0i6nsw1i43ydljws2xzadvbmxs1p50jn9akhinwrh8z4yxr5w6ks"; + url = mirror://xorg/X11R7.5/src/everything/font-bh-ttf-1.0.1.tar.bz2; + sha256 = "1j57lzrvnzhi56y7nzz4najymgvf093574czjh77zpy4ls22zrqw"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; + 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.0"; + name = "font-bh-type1-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-bh-type1-1.0.0.tar.bz2; - sha256 = "0nv4qdr8z68iczqic4gj492ln6y1xy04kxx08dhdaaf8y89mb2js"; + url = mirror://xorg/X11R7.5/src/everything/font-bh-type1-1.0.1.tar.bz2; + sha256 = "0idvayiwbysvhmrm0870hpw0cy0hgadcfl0zhgrvmq6dqqk5yfys"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; + 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.0"; + name = "font-bitstream-100dpi-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-bitstream-100dpi-1.0.0.tar.bz2; - sha256 = "1lp260dwrrr4ll9rbdq38cnvlxq843q34rxay6hl2bmmsxs5lw0c"; + url = mirror://xorg/X11R7.5/src/everything/font-bitstream-100dpi-1.0.1.tar.bz2; + sha256 = "0iq3kzabfvdssivhi4vmzhjan535ws48hxgc8rp0xh0d9nvwj19y"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; - })) // {inherit bdftopcf mkfontdir mkfontscale ;}; + 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.0"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-bitstream-75dpi-1.0.0.tar.bz2; - sha256 = "1yqv42gf4ksr5fr0b2szwfc8cczis0pppcsg1wdlwllprb6fmprd"; - }; - buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; - })) // {inherit bdftopcf mkfontdir mkfontscale ;}; - - fontbitstreamspeedo = (stdenv.mkDerivation ((if overrides ? fontbitstreamspeedo then overrides.fontbitstreamspeedo else x: x) { - name = "font-bitstream-speedo-1.0.0"; + name = "font-bitstream-75dpi-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-bitstream-speedo-1.0.0.tar.bz2; - sha256 = "1rpn2j99cg5dnw3mjzff65darwaz5jwjgi7i0xscq064d9w03b4r"; + url = mirror://xorg/X11R7.5/src/everything/font-bitstream-75dpi-1.0.1.tar.bz2; + sha256 = "0av66i14x3wj379jkgcjswawkis0imvr31v7wmkaa5qmqaqir7ng"; }; - buildInputs = [pkgconfig mkfontdir ]; - })) // {inherit mkfontdir ;}; + 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.0"; + name = "font-bitstream-type1-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-bitstream-type1-1.0.0.tar.bz2; - sha256 = "00yrahjc884mghhbm713c41x7r2kbg1ply515qs3g20nrwnlkkjg"; + url = mirror://xorg/X11R7.5/src/everything/font-bitstream-type1-1.0.1.tar.bz2; + sha256 = "1aqkw51m69k8dlwj3cllnqnfjgvpy59vd8n140v1ah4isk0pq0ji"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; + buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit mkfontdir mkfontscale ;}; - fontcacheproto = (stdenv.mkDerivation ((if overrides ? fontcacheproto then overrides.fontcacheproto else x: x) { - name = "fontcacheproto-0.1.2"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/fontcacheproto-0.1.2.tar.bz2; - sha256 = "1yfrldprqbxv587zd9lvsn2ayfdabzkgzya5cqvjf290kga3w1j8"; - }; - buildInputs = [pkgconfig ]; - })) // {inherit ;}; - fontcronyxcyrillic = (stdenv.mkDerivation ((if overrides ? fontcronyxcyrillic then overrides.fontcronyxcyrillic else x: x) { - name = "font-cronyx-cyrillic-1.0.0"; + name = "font-cronyx-cyrillic-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-cronyx-cyrillic-1.0.0.tar.bz2; - sha256 = "1vl4yk3sdvcqpym4d4r3lxrpyghxgjpq8yx2kdxygjpm6dq4xj86"; + url = mirror://xorg/X11R7.5/src/everything/font-cronyx-cyrillic-1.0.1.tar.bz2; + sha256 = "08ilkby85m8pj2nn3hnfawmxzg8gq36fpw4g7r8i2cgyi913md7p"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; - })) // {inherit bdftopcf mkfontdir mkfontscale ;}; + 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.0"; + name = "font-cursor-misc-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-cursor-misc-1.0.0.tar.bz2; - sha256 = "1igklmxc0bgbp5a2nbmbwii5d9mh71zsxay2sw0sa6sq2xqy4pcm"; + url = mirror://xorg/X11R7.5/src/everything/font-cursor-misc-1.0.1.tar.bz2; + sha256 = "1cy1gl9xnkab8ddb1krxpisa2c4cr0h47flsir23b8za3f305vny"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; - })) // {inherit bdftopcf mkfontdir mkfontscale ;}; + 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.0"; + name = "font-daewoo-misc-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-daewoo-misc-1.0.0.tar.bz2; - sha256 = "09l98sd8wwdhgjdafq8cr6ykki4imh5qi21jwaqkhfil5v4ym67i"; + url = mirror://xorg/X11R7.5/src/everything/font-daewoo-misc-1.0.1.tar.bz2; + sha256 = "14g4wqymc0csnpc0qa0pjndl3wqid13ll2vgk1yfqvy6h113wa72"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; - })) // {inherit bdftopcf mkfontdir mkfontscale ;}; + 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.0"; + name = "font-dec-misc-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-dec-misc-1.0.0.tar.bz2; - sha256 = "1fcbnv0zlbzsn68z5as0k3id83ii9k67l6bxiv2ypcfs4l96sf43"; + url = mirror://xorg/X11R7.5/src/everything/font-dec-misc-1.0.1.tar.bz2; + sha256 = "0lk596dw3yk9wspqy167q72r76pwzph9v4rhx0vf41ywzm5dl87v"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; - })) // {inherit bdftopcf mkfontdir mkfontscale ;}; + 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.0"; + name = "font-ibm-type1-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-ibm-type1-1.0.0.tar.bz2; - sha256 = "07j6kk7wd0lbnjxn9a4kjahjniiwjyzc8lp1lvw46sahwg193l1h"; + url = mirror://xorg/X11R7.5/src/everything/font-ibm-type1-1.0.1.tar.bz2; + sha256 = "06f9dihdss70w3h3rdak1zwkr0gdnryfw2lnsi85rp8grjashzl8"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; + 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.0"; + name = "font-isas-misc-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-isas-misc-1.0.0.tar.bz2; - sha256 = "18jfp92s6wmjs107rhdcz4acmzb2anhcb7s8bpd2kwhbrq9i7rlp"; + url = mirror://xorg/X11R7.5/src/everything/font-isas-misc-1.0.1.tar.bz2; + sha256 = "0yza5kqj89b81whkrdhficwryhzfgya4w5p8l33lvscixdlh9zjj"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; - })) // {inherit bdftopcf mkfontdir mkfontscale ;}; + 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.0"; + name = "font-jis-misc-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-jis-misc-1.0.0.tar.bz2; - sha256 = "1fn75mqx6xjqffbd01a1wplc8cf7spwsrxv5h2accizw9zyyw89p"; + url = mirror://xorg/X11R7.5/src/everything/font-jis-misc-1.0.1.tar.bz2; + sha256 = "1kz8ajxsalxhkqbs9m1icwrqji0972f1knqljaa62nrr0k19hfx6"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; - })) // {inherit bdftopcf mkfontdir mkfontscale ;}; + 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.0"; + name = "font-micro-misc-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-micro-misc-1.0.0.tar.bz2; - sha256 = "0wm52zgbly62vsbr5c4wz9rh1vk4y1viyv09r20r6bp175cppc8n"; + url = mirror://xorg/X11R7.5/src/everything/font-micro-misc-1.0.1.tar.bz2; + sha256 = "0awpwich27vhaccrqh6rg330yvfaab0d3jm6d0wzclxz73m8gfd5"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; - })) // {inherit bdftopcf mkfontdir mkfontscale ;}; + 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.0"; + name = "font-misc-cyrillic-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-misc-cyrillic-1.0.0.tar.bz2; - sha256 = "1zwh69k7id17jabwia6x43f520lbf8787nf71vs3p78j089sq2vw"; + url = mirror://xorg/X11R7.5/src/everything/font-misc-cyrillic-1.0.1.tar.bz2; + sha256 = "0xdgv2ad4qq1dvp6cy99wmrynri267n8dzbjk5220n6rjgyzpyns"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; - })) // {inherit bdftopcf mkfontdir mkfontscale ;}; + 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.0"; + name = "font-misc-ethiopic-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-misc-ethiopic-1.0.0.tar.bz2; - sha256 = "0hficywkkzl4dpws9sg47d3m1igpb7m4myw8zabkf1na0648dljq"; + url = mirror://xorg/X11R7.5/src/everything/font-misc-ethiopic-1.0.1.tar.bz2; + sha256 = "0j6rsf5nwgm8afvjr6c3ga5rnhpd2dqhwnczsyr4fh3c9fcklfxz"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; + 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.0"; + name = "font-misc-meltho-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-misc-meltho-1.0.0.tar.bz2; - sha256 = "091ripcw30cs6032p12gwcy2hg8b1y24irgacwsky1dn4scjpqf7"; + url = mirror://xorg/X11R7.5/src/everything/font-misc-meltho-1.0.1.tar.bz2; + sha256 = "0616v6pamg41q4yhm7wiaycky49hhkfwvabn8r89w64ayfhdfrjk"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; + 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.0.0"; + name = "font-misc-misc-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-misc-misc-1.0.0.tar.bz2; - sha256 = "1nqp7zhwmrh6ng8j4i4pscqj2xhh57sdmrkbqgklh5hzmmh2b816"; + url = mirror://xorg/X11R7.5/src/everything/font-misc-misc-1.1.0.tar.bz2; + sha256 = "0ys9in88psmxsryci4pq5jj9208jlzamsmfdxw8rlcagp6555xsh"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; - })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; + 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.0"; + name = "font-mutt-misc-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-mutt-misc-1.0.0.tar.bz2; - sha256 = "1zzd3ba1i2ffqh8yyvyqyhcyxa7j474lb8x88b5cxf7js0xih6gj"; + url = mirror://xorg/X11R7.5/src/everything/font-mutt-misc-1.0.1.tar.bz2; + sha256 = "09bfj00kaf31zncj5k2dm1in5ldp8pmrhrji9vprp16iyp5k7gvp"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; - })) // {inherit bdftopcf mkfontdir mkfontscale ;}; + 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.0.0"; + name = "font-schumacher-misc-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-schumacher-misc-1.0.0.tar.bz2; - sha256 = "0ypgas5hjwaad53hfpx2w5s1scybh953vb94rrlmaix4hpw6qkj5"; + url = mirror://xorg/X11R7.5/src/everything/font-schumacher-misc-1.1.0.tar.bz2; + sha256 = "0k8vvssb2dyr9vwal493zkq7x1d0draffvh8wvjzwc1rnmgr20rh"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; - })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; + 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.1"; + name = "font-screen-cyrillic-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-screen-cyrillic-1.0.1.tar.bz2; - sha256 = "07y52rm2m17ig6piynk9jgyhdv8a4s7jmn5ssa83a61a607mymyr"; + url = mirror://xorg/X11R7.5/src/everything/font-screen-cyrillic-1.0.2.tar.bz2; + sha256 = "04dyzq73yq0278pk9ssbhb9ia518djgzj9ybi8snvw9zn4gqipf5"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; - })) // {inherit bdftopcf mkfontdir mkfontscale ;}; + 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.0"; + name = "font-sony-misc-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-sony-misc-1.0.0.tar.bz2; - sha256 = "08rf8m9mqg9h0w67b5k55hs73v2s9lxz7aab0nq7rd90c3kkms8s"; + url = mirror://xorg/X11R7.5/src/everything/font-sony-misc-1.0.1.tar.bz2; + sha256 = "1jjnzhxzbk2x1byp77yddcni0myd73sxilqj75fkkkkl9j22d5fs"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; - })) // {inherit bdftopcf mkfontdir mkfontscale ;}; + 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.0.2"; + name = "fontsproto-2.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/fontsproto-2.0.2.tar.bz2; - sha256 = "0ywb783l7gwypq5nchfmysra0n6dqv9hc3vsf4ra44da65qm9gc3"; + url = mirror://xorg/X11R7.5/src/everything/fontsproto-2.1.0.tar.bz2; + sha256 = "0dgb7b49h60wvrcpzax1i7wa03lpkl5f6jkfpb4qh90lr4fzd6js"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; fontsunmisc = (stdenv.mkDerivation ((if overrides ? fontsunmisc then overrides.fontsunmisc else x: x) { - name = "font-sun-misc-1.0.0"; + name = "font-sun-misc-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-sun-misc-1.0.0.tar.bz2; - sha256 = "1r99ayxfc1qqcg6zwfkkvbga3qwyf3h3xsh1ymw02zwf9n7jvh83"; + url = mirror://xorg/X11R7.5/src/everything/font-sun-misc-1.0.1.tar.bz2; + sha256 = "02cxmssnri09iz2a673f38x3wj94yn96m55b69s1m5cgxbsj45a1"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; - })) // {inherit bdftopcf mkfontdir mkfontscale ;}; + 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.0.1"; + name = "font-util-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-util-1.0.1.tar.bz2; - sha256 = "04h6c24q08d8ljajxzlfwyr1fxfhb88b3w21nfmy6bm3gsqj7304"; + url = mirror://xorg/X11R7.5/src/everything/font-util-1.1.1.tar.bz2; + sha256 = "121gq3iiz0hydvcqfh88adrqkky3zs48irjwa31xfgvw1lxiwgx3"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; fontwinitzkicyrillic = (stdenv.mkDerivation ((if overrides ? fontwinitzkicyrillic then overrides.fontwinitzkicyrillic else x: x) { - name = "font-winitzki-cyrillic-1.0.0"; + name = "font-winitzki-cyrillic-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-winitzki-cyrillic-1.0.0.tar.bz2; - sha256 = "1qzf9f1irn4difbz2s6j8yhn4hdg95j35q89nhss7rpwh5l7z2j7"; + url = mirror://xorg/X11R7.5/src/everything/font-winitzki-cyrillic-1.0.1.tar.bz2; + sha256 = "0ihlvf6rsd8hpdyp09zfisvp44sxdddpi3zbld1ya66vf2gw4mvw"; }; - buildInputs = [pkgconfig bdftopcf mkfontdir mkfontscale ]; - })) // {inherit bdftopcf mkfontdir mkfontscale ;}; + 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.1"; + name = "font-xfree86-type1-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/font-xfree86-type1-1.0.1.tar.bz2; - sha256 = "0hgksnwch59bxxxpmzlwrm2qqhnpj651m458bv1azn1026wgkncg"; + url = mirror://xorg/X11R7.5/src/everything/font-xfree86-type1-1.0.2.tar.bz2; + sha256 = "1k86ryqkhq3rrvsz5w7a28i9n5jv29hx6p5kq6r1k9p5mzm6l0ks"; }; - buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; + buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit mkfontdir mkfontscale ;}; gccmakedep = (stdenv.mkDerivation ((if overrides ? gccmakedep then overrides.gccmakedep else x: x) { @@ -528,21 +478,21 @@ let })) // {inherit ;}; glproto = (stdenv.mkDerivation ((if overrides ? glproto then overrides.glproto else x: x) { - name = "glproto-1.4.9"; + name = "glproto-1.4.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/glproto-1.4.9.tar.bz2; - sha256 = "18v48zb3jfxlcvhi66zxk7mr4y37vj48qv3vlv9npxghwixzpmv9"; + url = mirror://xorg/X11R7.5/src/everything/glproto-1.4.10.tar.bz2; + sha256 = "1kvgf662xdapcbxlnmxjmzhswks1zvq4ig48r9pgbm14mql3mf3z"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; iceauth = (stdenv.mkDerivation ((if overrides ? iceauth then overrides.iceauth else x: x) { - name = "iceauth-1.0.2"; + name = "iceauth-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/iceauth-1.0.2.tar.bz2; - sha256 = "1fxmpa9262b1iklxmy3ca72m34x11qixbqsm4b7w98jpvs8iah06"; + url = mirror://xorg/X11R7.5/src/everything/iceauth-1.0.3.tar.bz2; + sha256 = "07nq2y8py2hvp54dklvv9y8l6b76wlmfkw3llh02dnpjr7v3zjmb"; }; buildInputs = [pkgconfig libICE xproto ]; })) // {inherit libICE xproto ;}; @@ -558,231 +508,221 @@ let })) // {inherit xproto ;}; inputproto = (stdenv.mkDerivation ((if overrides ? inputproto then overrides.inputproto else x: x) { - name = "inputproto-1.4.4"; + name = "inputproto-2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/inputproto-1.4.4.tar.bz2; - sha256 = "1rfz0x03iw18ji6728qnqmi56blqgak89vzs7sgbpfnnjbs8w9v3"; + url = mirror://xorg/X11R7.5/src/everything/inputproto-2.0.tar.bz2; + sha256 = "1x0sx8ilw857r69ddfr94x66gf8x17284nd20c9hmclajbvmfbs7"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; kbproto = (stdenv.mkDerivation ((if overrides ? kbproto then overrides.kbproto else x: x) { - name = "kbproto-1.0.3"; + name = "kbproto-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/kbproto-1.0.3.tar.bz2; - sha256 = "1pqrrsag6njdrxpx5sm48gh68w64fv5jpmvp2jkjhynhpdg0003h"; + url = mirror://xorg/X11R7.5/src/everything/kbproto-1.0.4.tar.bz2; + sha256 = "0g30x2jgabp3bx6h556f9777dk384xk45zfzh7mw7l0k2f9jkahv"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; libAppleWM = (stdenv.mkDerivation ((if overrides ? libAppleWM then overrides.libAppleWM else x: x) { - name = "libAppleWM-1.0.0"; + name = "libAppleWM-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libAppleWM-1.0.0.tar.bz2; - sha256 = "0zj0n0ykv3zy68d23xyf2c58ddn5m78b8j1zcynb93j1g90gzlpc"; + url = mirror://xorg/X11R7.5/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.1"; + name = "libFS-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libFS-1.0.1.tar.bz2; - sha256 = "1x9cbaildzwi2ih5vylvdfqk7a7j040nq6ndh9vf0s8ynpyjzycv"; + url = mirror://xorg/X11R7.5/src/everything/libFS-1.0.2.tar.bz2; + sha256 = "0j9hrqsn808zpr573p6vnpg17p3nk7ry7d6x1ghjdc52xbjmyamg"; }; 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.4"; + name = "libICE-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libICE-1.0.4.tar.bz2; - sha256 = "012ga4q5rxajnn3fd249xnirnvw6lms7jyp9bh9vsp349hpmw18k"; + url = mirror://xorg/X11R7.5/src/everything/libICE-1.0.6.tar.bz2; + sha256 = "12sn3d28figzmszcacbcv4v1k03jdp4g2ca5riza4ajxa1cnhd58"; }; buildInputs = [pkgconfig xproto xtrans ]; })) // {inherit xproto xtrans ;}; libSM = (stdenv.mkDerivation ((if overrides ? libSM then overrides.libSM else x: x) { - name = "libSM-1.1.0"; + name = "libSM-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libSM-1.1.0.tar.bz2; - sha256 = "10iap6ydxmk0g5qcfnsf9yc30fhvqshgppm0sca21y0z5qwaqdkm"; + url = mirror://xorg/X11R7.5/src/everything/libSM-1.1.1.tar.bz2; + sha256 = "1q3wmblw594vzylndcb20cdq3yjgzpy2xmghyhzin0vaii6ih3gm"; }; buildInputs = [pkgconfig libICE libuuid xproto xtrans ]; })) // {inherit libICE libuuid xproto xtrans ;}; libWindowsWM = (stdenv.mkDerivation ((if overrides ? libWindowsWM then overrides.libWindowsWM else x: x) { - name = "libWindowsWM-1.0.0"; + name = "libWindowsWM-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libWindowsWM-1.0.0.tar.bz2; - sha256 = "0shnxkg9ghihgyrl3dzhqdcgssa7146dn1j51rzbl89x2xk75n3a"; + url = mirror://xorg/X11R7.5/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.2.1"; + name = "libX11-1.3.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libX11-1.2.1.tar.bz2; - sha256 = "1wyzvwzywqafh9zmqb5v1fca34y11674xns5y57pyq5206jfawni"; + url = mirror://xorg/X11R7.5/src/everything/libX11-1.3.2.tar.bz2; + sha256 = "1cmwnk3k4dsirg895rrz7pmcsjjrai8ng7gjy68dd1ffkxf4vvsd"; }; 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 ;}; libXScrnSaver = (stdenv.mkDerivation ((if overrides ? libXScrnSaver then overrides.libXScrnSaver else x: x) { - name = "libXScrnSaver-1.1.3"; + name = "libXScrnSaver-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libXScrnSaver-1.1.3.tar.bz2; - sha256 = "1269nbcrfyark3h4687pjkcsldsi0ygy1iigmym28nn1jd82942b"; + url = mirror://xorg/X11R7.5/src/everything/libXScrnSaver-1.2.0.tar.bz2; + sha256 = "11bz918c8c2r8m5y5rgm25f0xsq7l46g5rdx4r941dif1zn7n1jv"; }; buildInputs = [pkgconfig scrnsaverproto libX11 libXext xextproto ]; })) // {inherit scrnsaverproto libX11 libXext xextproto ;}; libXau = (stdenv.mkDerivation ((if overrides ? libXau then overrides.libXau else x: x) { - name = "libXau-1.0.4"; + name = "libXau-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libXau-1.0.4.tar.bz2; - sha256 = "0b5jvqp0n9iz3qag4k7g2bwzs7d0vy5sd6rhhd00l30dy2jzzlqh"; + url = mirror://xorg/X11R7.5/src/everything/libXau-1.0.5.tar.bz2; + sha256 = "1vh8h4fhf6i59qwqqd4i2ki2qv0hajpx3cp1ri2rryi9iplb60x5"; }; buildInputs = [pkgconfig xproto ]; })) // {inherit xproto ;}; libXaw = (stdenv.mkDerivation ((if overrides ? libXaw then overrides.libXaw else x: x) { - name = "libXaw-1.0.4"; + name = "libXaw-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libXaw-1.0.4.tar.bz2; - sha256 = "1yaslcpj6sd6s8gx2hv60gfjf515gggd8f2jv4zqbp5q9wcapx0i"; + url = mirror://xorg/X11R7.5/src/everything/libXaw-1.0.7.tar.bz2; + sha256 = "0a7kqs23c3vwf2gibdm4xw8ylw7fqn0h72c01z4b31lmn3lsw2kl"; }; - buildInputs = [pkgconfig printproto libX11 libXau libXext xextproto libXmu libXp libXpm xproto libXt ]; - })) // {inherit printproto libX11 libXau libXext xextproto libXmu libXp libXpm xproto libXt ;}; + 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.0"; + name = "libXcomposite-0.4.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libXcomposite-0.4.0.tar.bz2; - sha256 = "043m7jhqzqfb02g29v8k57xxm4vqbw15gln4wja81xni5pl5kdvx"; + url = mirror://xorg/X11R7.5/src/everything/libXcomposite-0.4.1.tar.bz2; + sha256 = "04vs1ml9y60g8046kg79wn71455m2c8xn1c88sq8wb92cmas459p"; }; buildInputs = [pkgconfig compositeproto fixesproto libX11 libXext libXfixes xproto ]; })) // {inherit compositeproto fixesproto libX11 libXext libXfixes xproto ;}; libXcursor = (stdenv.mkDerivation ((if overrides ? libXcursor then overrides.libXcursor else x: x) { - name = "libXcursor-1.1.9"; + name = "libXcursor-1.1.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libXcursor-1.1.9.tar.bz2; - sha256 = "1d6j2md25f6g45xjb2sqsqwvdidf9i3n3mb682bcxj3i49ab7zqx"; + url = mirror://xorg/X11R7.5/src/everything/libXcursor-1.1.10.tar.bz2; + sha256 = "1gbcwf5v108m96y9gpghjb3hv7chvibh1k3b9chc7wh34bv6si5r"; }; buildInputs = [pkgconfig fixesproto libX11 libXfixes xproto libXrender ]; })) // {inherit fixesproto libX11 libXfixes xproto libXrender ;}; libXdamage = (stdenv.mkDerivation ((if overrides ? libXdamage then overrides.libXdamage else x: x) { - name = "libXdamage-1.1.1"; + name = "libXdamage-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libXdamage-1.1.1.tar.bz2; - sha256 = "0bmf5y9wwas5g40inghq7lzcm48z36zip27pmp1s2lirn96pa0h1"; + url = mirror://xorg/X11R7.5/src/everything/libXdamage-1.1.2.tar.bz2; + sha256 = "02kwzk41a2b9wmlvrivz7nhbl15vihrjla7fl38w89s8nfn10sm5"; }; 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.2"; + name = "libXdmcp-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libXdmcp-1.0.2.tar.bz2; - sha256 = "1a4n1z0vfzw10pcj27g95rjn06c231cg38l44z14b4ar8wc0rrgk"; + url = mirror://xorg/X11R7.5/src/everything/libXdmcp-1.0.3.tar.bz2; + sha256 = "1jvqfcc7cng7qsdqxj1ivbki3id1kkb3mdqn9zgddzi0mqpkl0yq"; }; buildInputs = [pkgconfig xproto ]; })) // {inherit xproto ;}; libXext = (stdenv.mkDerivation ((if overrides ? libXext then overrides.libXext else x: x) { - name = "libXext-1.0.5"; + name = "libXext-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXext-1.0.5.tar.bz2; - sha256 = "15vx6712s53640gv307bpa2pg7ds8wrxx3l5i554id3c8scaz00j"; + url = mirror://xorg/X11R7.5/src/everything/libXext-1.1.1.tar.bz2; + sha256 = "1cwv3sllfk1xwc7gkld8ifyxrgkl3j0d1539amcnda5kgyyf630i"; }; - buildInputs = [pkgconfig libX11 libXau xextproto xproto ]; - })) // {inherit libX11 libXau xextproto xproto ;}; + buildInputs = [pkgconfig libX11 xextproto xproto ]; + })) // {inherit libX11 xextproto xproto ;}; libXfixes = (stdenv.mkDerivation ((if overrides ? libXfixes then overrides.libXfixes else x: x) { - name = "libXfixes-4.0.3"; + name = "libXfixes-4.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libXfixes-4.0.3.tar.bz2; - sha256 = "1p99m3hdh9m6a59jyn4vgwbppabhppsjdkjkwrfbii1pa0y0jzjl"; + url = mirror://xorg/X11R7.5/src/everything/libXfixes-4.0.4.tar.bz2; + sha256 = "0j1vwd5jwqc6wzv2jz18al2qdzm7k9kgs2x5rcq7r461qpjxfcds"; }; 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.3.3"; + name = "libXfont-1.4.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libXfont-1.3.3.tar.bz2; - sha256 = "0nhxynfhljfwvpq9f867fvc15r78r363rinr3dhk6qxxljyfcwb1"; + url = mirror://xorg/X11R7.5/src/everything/libXfont-1.4.1.tar.bz2; + sha256 = "0ybndzh6hc9l8arvvc6j5cbbby52b9n5654r9kndx60bh8qgqaqi"; }; - buildInputs = [pkgconfig fontcacheproto libfontenc fontsproto freetype xproto xtrans zlib ]; - })) // {inherit fontcacheproto libfontenc fontsproto freetype xproto xtrans zlib ;}; - - libXfontcache = (stdenv.mkDerivation ((if overrides ? libXfontcache then overrides.libXfontcache else x: x) { - name = "libXfontcache-1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libXfontcache-1.0.4.tar.bz2; - sha256 = "0770yg0b9vqqlsq34nxb7ri3pf0smlhx018vmxidikc1pz7lgrzz"; - }; - buildInputs = [pkgconfig fontcacheproto libX11 libXext xextproto ]; - })) // {inherit fontcacheproto libX11 libXext xextproto ;}; + 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.13"; + name = "libXft-2.1.14"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libXft-2.1.13.tar.bz2; - sha256 = "136yrzxb5xmpd34plhfj4yvla0iish3b7kqv8api8k7ki8jqhxnf"; + url = mirror://xorg/X11R7.5/src/everything/libXft-2.1.14.tar.bz2; + sha256 = "0phpypmkj0dl9vq7wl0jr207gky4s37sbi7sspgx7jl19dcrs3kh"; }; buildInputs = [pkgconfig fontconfig freetype libXrender ]; })) // {inherit fontconfig freetype libXrender ;}; libXi = (stdenv.mkDerivation ((if overrides ? libXi then overrides.libXi else x: x) { - name = "libXi-1.1.3"; + name = "libXi-1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libXi-1.1.3.tar.bz2; - sha256 = "0gqm2a4bplpidhzknqvr6b1ipadcayyz3z6y794sdl6hjyz5nyn7"; + url = mirror://xorg/X11R7.5/src/everything/libXi-1.3.tar.bz2; + sha256 = "0jwl19w8ry30v4wyar3fv9xbhzp3fbx1mq6p7c342s1qc068qarn"; }; 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.0.3"; + name = "libXinerama-1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libXinerama-1.0.3.tar.bz2; - sha256 = "068j31apk38dapqfs368h9jzwx2xm6vk0qmmh02w4m31sm65dcq7"; + url = mirror://xorg/X11R7.5/src/everything/libXinerama-1.1.tar.bz2; + sha256 = "0d5zf9ksbhmpmzk5iglkvwvxkf69cl0r3m4dr56b8cg1q9s9xlz0"; }; 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.4"; + name = "libXmu-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libXmu-1.0.4.tar.bz2; - sha256 = "1w0qz8m8qq8nvamipzmry99sgxgn3xzjvk4xzbphhk4gxpb00g7q"; + url = mirror://xorg/X11R7.5/src/everything/libXmu-1.0.5.tar.bz2; + sha256 = "1mr6f4pqzzdpkqghp6jpb9grgc5z4w8hn0hqhjmcy68hxjqbd4h6"; }; buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ]; })) // {inherit libX11 libXext xextproto xproto libXt ;}; @@ -798,171 +738,171 @@ let })) // {inherit printproto libX11 libXau libXext xextproto ;}; libXpm = (stdenv.mkDerivation ((if overrides ? libXpm then overrides.libXpm else x: x) { - name = "libXpm-3.5.7"; + name = "libXpm-3.5.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libXpm-3.5.7.tar.bz2; - sha256 = "1aibr6y6hnlgc7m1a1y5s1qx7863praq4pdp0xrpkc75gkk1lw34"; + url = mirror://xorg/X11R7.5/src/everything/libXpm-3.5.8.tar.bz2; + sha256 = "0k1cajiw7ijzphrysr2d4yc5s10822nvkbh4xvhkbqz66am7m9q2"; }; 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.2.3"; + name = "libXrandr-1.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libXrandr-1.2.3.tar.bz2; - sha256 = "0ryj1v6127j0639by810jxiaspwsn2l837wl79x6ghy4p0kgxvgq"; + url = mirror://xorg/X11R7.5/src/everything/libXrandr-1.3.0.tar.bz2; + sha256 = "0y1fh1jf199kdkx7yl8h9azz468pq2d6dvdk1213l5y5fw7wwqar"; }; buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto xproto libXrender ]; })) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;}; libXrender = (stdenv.mkDerivation ((if overrides ? libXrender then overrides.libXrender else x: x) { - name = "libXrender-0.9.4"; + name = "libXrender-0.9.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libXrender-0.9.4.tar.bz2; - sha256 = "1v0p63g426x0hii0gynq05ccwihr6dn9azjpls8z4zjfvm1x70jn"; + url = mirror://xorg/X11R7.5/src/everything/libXrender-0.9.5.tar.bz2; + sha256 = "1mfmbvq3xsx81zd1fj595b8ar2asdva4lvxcrdsbdqjbi91r01dw"; }; 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.3"; + name = "libXres-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libXres-1.0.3.tar.bz2; - sha256 = "0c02i8wnwdnzkiaviddc2h7xswg6s58ipw4m204hzv7mfdsvmmd6"; + url = mirror://xorg/X11R7.5/src/everything/libXres-1.0.4.tar.bz2; + sha256 = "1pvjfn3mczr788x4nh877f911w63abx7z29gng7ri1zgf1x5czs5"; }; 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.5"; + name = "libXt-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libXt-1.0.5.tar.bz2; - sha256 = "1x4w7qdciwgjj0ccr1xn7v21pf1csi6cs99j8s54414slnnp5i23"; + url = mirror://xorg/X11R7.5/src/everything/libXt-1.0.7.tar.bz2; + sha256 = "1v59vll1jy4g2c3jpljj1xyw4nggqpn6jlnffiglbj31n1454vbh"; }; - buildInputs = [pkgconfig kbproto libSM libX11 xproto ]; - })) // {inherit kbproto libSM libX11 xproto ;}; + 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.0.3"; + name = "libXtst-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libXtst-1.0.3.tar.bz2; - sha256 = "01f9b3386v3dzlvdg0ccpa2wyv0d6b9fbxy149rws17bkhyxva5l"; + url = mirror://xorg/X11R7.5/src/everything/libXtst-1.1.0.tar.bz2; + sha256 = "09pblj4h8i6fdl553lsgn511vgygl6jq4dx83chmfsg0g53hyi5x"; }; - buildInputs = [pkgconfig inputproto recordproto libX11 libXext xextproto ]; - })) // {inherit inputproto recordproto libX11 libXext xextproto ;}; + 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.4"; + name = "libXv-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libXv-1.0.4.tar.bz2; - sha256 = "1j18fif5mv1gsb7nswqw010impwi7aifqm3036bd79jddydw8g2d"; + url = mirror://xorg/X11R7.5/src/everything/libXv-1.0.5.tar.bz2; + sha256 = "0430v78igg9hgkf5alj3sb20i7xg88if3pl5r9ybkvzy4bgsyjfm"; }; 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.4"; + name = "libXvMC-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libXvMC-1.0.4.tar.bz2; - sha256 = "1frshf8nfa81hz4q61qg1pc2sz93dl6nsc78dr39hqfnm1dq45qj"; + url = mirror://xorg/X11R7.5/src/everything/libXvMC-1.0.5.tar.bz2; + sha256 = "0zyyiwrfx303lfcb8av4apbql2r2w34rzc0czq7ayhw3s9lcfi06"; }; 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.0.2"; + name = "libXxf86dga-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libXxf86dga-1.0.2.tar.bz2; - sha256 = "09cs62bvnv1wwjqcqyckhj0b0v7wa3dyldlg2icv67qal0q545sr"; + url = mirror://xorg/X11R7.5/src/everything/libXxf86dga-1.1.1.tar.bz2; + sha256 = "05jnvsl70c1dgvkldrgaqsjq72ar0papprx346w5rwfgbs4zhdwd"; }; 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.1"; + name = "libXxf86misc-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libXxf86misc-1.0.1.tar.bz2; - sha256 = "128jm6nssp5wfic17rb54ssz6j3hibm77c9xxgm6x85a95yxc8i1"; + url = mirror://xorg/individual/lib/libXxf86misc-1.0.2.tar.bz2; + sha256 = "1cvwjl4f83ic97j9da95x2a7gd0hw5vnv1pxn49d3z1lpyqvcr4f"; }; 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.0.2"; + name = "libXxf86vm-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libXxf86vm-1.0.2.tar.bz2; - sha256 = "1pji77kksdjn3n1hi6970dqs58jbdvmxphm6ddlbqkraap3c7crw"; + url = mirror://xorg/X11R7.5/src/everything/libXxf86vm-1.1.0.tar.bz2; + sha256 = "1s4dhgl879hkfys28gl3rflas4ci48kiyx359rzjdi9pndvybibw"; }; 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.0.2"; + name = "libdmx-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libdmx-1.0.2.tar.bz2; - sha256 = "1i5r4spy5s9s5nfxzpxlx06j6xcf865z821cfq2flz1zahdg6gzs"; + url = mirror://xorg/X11R7.5/src/everything/libdmx-1.1.0.tar.bz2; + sha256 = "1mg2sd8xlwcz6lysdc3zld05a2fa1a4hfxxhbh87cpfc93wah10r"; }; 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.4"; + name = "libfontenc-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libfontenc-1.0.4.tar.bz2; - sha256 = "1j2qc9xqc2wibc005abvkj8wwn9hk6b5s2qn94ma2ig82wysm4xr"; + url = mirror://xorg/X11R7.5/src/everything/libfontenc-1.0.5.tar.bz2; + sha256 = "001749s6whw04fv0426zk48p0wqn29g2ba5i42kkvbg9641xwg3z"; }; buildInputs = [pkgconfig xproto zlib ]; })) // {inherit xproto zlib ;}; libpciaccess = (stdenv.mkDerivation ((if overrides ? libpciaccess then overrides.libpciaccess else x: x) { - name = "libpciaccess-0.10.5"; + name = "libpciaccess-0.10.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libpciaccess-0.10.5.tar.bz2; - sha256 = "0pg99b53cp3ypa7w99dsd2l6xdcbhldp8iivrd9r1rcl75d7didn"; + url = mirror://xorg/X11R7.5/src/everything/libpciaccess-0.10.9.tar.bz2; + sha256 = "1bgy2f17k0iflx5fb9fysgh1i46f3ip01gxlxbyfsxmyp21rdjsw"; }; buildInputs = [pkgconfig zlib ]; })) // {inherit zlib ;}; libpthreadstubs = (stdenv.mkDerivation ((if overrides ? libpthreadstubs then overrides.libpthreadstubs else x: x) { - name = "libpthread-stubs-0.1"; + name = "libpthread-stubs-0.3"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/libpthread-stubs-0.1.tar.bz2; - sha256 = "0raxl73kmviqinp00bfa025d0j4vmfjjcvfn754mi60mw48swk80"; + url = http://xcb.freedesktop.org/dist/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.2"; + name = "libxcb-1.4"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/libxcb-1.2.tar.bz2; - sha256 = "0gyb6fqhl07mfl1rrhqb5195iy11jmx0dmjsqb7flp0cxmcldqag"; + url = http://xcb.freedesktop.org/dist/libxcb-1.4.tar.bz2; + sha256 = "17i0sfm66gkqycsyr6iw5q16fbf8qp0sw39ir1nv1gp4vp9y5dh7"; }; 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.5"; + name = "libxkbfile-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/libxkbfile-1.0.5.tar.bz2; - sha256 = "0pwnb3jv4105mj3mpadc23aq3388fcsq5nb1z02nvjy93wkjidha"; + url = mirror://xorg/X11R7.5/src/everything/libxkbfile-1.0.6.tar.bz2; + sha256 = "0fb0l221m5fsifydrih3fg6ndlsrm0d4fa53cx0rk0i7dcgkr91c"; }; buildInputs = [pkgconfig kbproto libX11 ]; })) // {inherit kbproto libX11 ;}; @@ -978,51 +918,51 @@ let })) // {inherit xproto ;}; luit = (stdenv.mkDerivation ((if overrides ? luit then overrides.luit else x: x) { - name = "luit-1.0.3"; + name = "luit-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/luit-1.0.3.tar.bz2; - sha256 = "1mx5fw4iz62gz2y6z92w0wnl81zvfhah9hzd09zsd2gf5qaz4410"; + url = mirror://xorg/X11R7.5/src/everything/luit-1.0.4.tar.bz2; + sha256 = "0ll2rcg65h0gd18jkj56kbp9j7816j0cnycxz1h20razjw0da76i"; }; buildInputs = [pkgconfig libfontenc libX11 zlib ]; })) // {inherit libfontenc libX11 zlib ;}; makedepend = (stdenv.mkDerivation ((if overrides ? makedepend then overrides.makedepend else x: x) { - name = "makedepend-1.0.1"; + name = "makedepend-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/makedepend-1.0.1.tar.bz2; - sha256 = "1lmi2vagp6svfvkqmhsbafjhchwscii7sfdzr20d90hg46gsslmp"; + url = mirror://xorg/X11R7.5/src/everything/makedepend-1.0.2.tar.bz2; + sha256 = "0mvnjrx161wrzn602c3fd012fixsi8j74dvqahk5nz1dlf8b18j1"; }; buildInputs = [pkgconfig xproto ]; })) // {inherit xproto ;}; mkfontdir = (stdenv.mkDerivation ((if overrides ? mkfontdir then overrides.mkfontdir else x: x) { - name = "mkfontdir-1.0.4"; + name = "mkfontdir-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/mkfontdir-1.0.4.tar.bz2; - sha256 = "1qzqrb3pg96gd0mifw74syghajwpkkbda0gzwkl4ww171p3kr6kg"; + url = mirror://xorg/X11R7.5/src/everything/mkfontdir-1.0.5.tar.bz2; + sha256 = "02rd3b8gp3dxfws2fff07fcxm0z2rlbdhxqm23wijdjhzw66ad55"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; mkfontscale = (stdenv.mkDerivation ((if overrides ? mkfontscale then overrides.mkfontscale else x: x) { - name = "mkfontscale-1.0.5"; + name = "mkfontscale-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/mkfontscale-1.0.5.tar.bz2; - sha256 = "0l1qxlqb57idiafbzbfhsfjd4pn5vdv4fbizxfwvxhrx2magz7gp"; + url = mirror://xorg/X11R7.5/src/everything/mkfontscale-1.0.7.tar.bz2; + sha256 = "09vivvbw6hbx7n1aq4k4gp23g3pp1bv1zjw2cmm22cx2rhlv41l3"; }; 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.15.2"; + name = "pixman-0.16.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/pixman-0.15.2.tar.bz2; - sha256 = "1wf0cmx8jj5l0d0g0d948a8z2k1yram3dvgd08yxl8v8pdjvadzm"; + url = mirror://xorg/individual/lib/pixman-0.16.2.tar.bz2; + sha256 = "0q3754f9fjxmzjh2fv47dfhdvwy0gj19zyail9z2az79j8rzmcl0"; }; buildInputs = [pkgconfig perl ]; })) // {inherit perl ;}; @@ -1038,95 +978,85 @@ let })) // {inherit libXau ;}; randrproto = (stdenv.mkDerivation ((if overrides ? randrproto then overrides.randrproto else x: x) { - name = "randrproto-1.2.1"; + name = "randrproto-1.3.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/randrproto-1.2.1.tar.bz2; - sha256 = "0m7n624h2rsxs7m5x03az87x7hlh0gxqphj59q7laqi5iwpx8bqh"; + url = mirror://xorg/X11R7.5/src/everything/randrproto-1.3.1.tar.bz2; + sha256 = "1jl5k46lq4p1jv4mfdpj8zp4m79wzfnyxq97dbd4a2kimv0a6g6r"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; recordproto = (stdenv.mkDerivation ((if overrides ? recordproto then overrides.recordproto else x: x) { - name = "recordproto-1.13.2"; + name = "recordproto-1.14"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/recordproto-1.13.2.tar.bz2; - sha256 = "1yfg15k5fznjvndvld3vw7gcbcmq1p6ic0dybf1a2wzk2j5pmrq4"; + url = mirror://xorg/X11R7.5/src/everything/recordproto-1.14.tar.bz2; + sha256 = "0ryhd6g2h7bg7vzf7dvfgf3n2bbscpqhr9x01alkxamxs9dkglhv"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; renderproto = (stdenv.mkDerivation ((if overrides ? renderproto then overrides.renderproto else x: x) { - name = "renderproto-0.9.3"; + name = "renderproto-0.11"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/renderproto-0.9.3.tar.bz2; - sha256 = "0nyl5pmgrvw7p6laqgsrk65b633yvrrf8jx0vakqz2p9fyw0i2n9"; + url = mirror://xorg/X11R7.5/src/everything/renderproto-0.11.tar.bz2; + sha256 = "1hpzxlmk4hylriqx10h9ixq64ksk3lbhr2cli8r9mvdnn3cxdlf4"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; resourceproto = (stdenv.mkDerivation ((if overrides ? resourceproto then overrides.resourceproto else x: x) { - name = "resourceproto-1.0.2"; + name = "resourceproto-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/resourceproto-1.0.2.tar.bz2; - sha256 = "11rlnn54y15bf39ll7vzn9824l1ib15r7p4v8l0k0j7mxvydccqc"; + url = mirror://xorg/X11R7.5/src/everything/resourceproto-1.1.0.tar.bz2; + sha256 = "0sxk97siq4qkm4r0q6c4fdb7glbasbbx1lj4p0dis574cyq9m3a0"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; scrnsaverproto = (stdenv.mkDerivation ((if overrides ? scrnsaverproto then overrides.scrnsaverproto else x: x) { - name = "scrnsaverproto-1.1.0"; + name = "scrnsaverproto-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/scrnsaverproto-1.1.0.tar.bz2; - sha256 = "13s7rpygj0zm8lk6r9zw1ivs8wj3g4qrfqw80ifc0ff37kvsn2fv"; + url = mirror://xorg/X11R7.5/src/everything/scrnsaverproto-1.2.0.tar.bz2; + sha256 = "16adwjq9cnf15a4gv87c0s1kkwm1w1k3lg1s6nmhszk128r0mbyy"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; sessreg = (stdenv.mkDerivation ((if overrides ? sessreg then overrides.sessreg else x: x) { - name = "sessreg-1.0.4"; + name = "sessreg-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/sessreg-1.0.4.tar.bz2; - sha256 = "00lqgsdm74kz7csi9is906gr3nfwz3viaax10ipw32i05r867q93"; + url = mirror://xorg/X11R7.5/src/everything/sessreg-1.0.5.tar.bz2; + sha256 = "1afir60wikx4xx0d5mbk01s5p5l4wk6y37gfiy0vnlwd078gn21k"; }; buildInputs = [pkgconfig xproto ]; })) // {inherit xproto ;}; setxkbmap = (stdenv.mkDerivation ((if overrides ? setxkbmap then overrides.setxkbmap else x: x) { - name = "setxkbmap-1.0.4"; + name = "setxkbmap-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/setxkbmap-1.0.4.tar.bz2; - sha256 = "1b1brw1v98q2rqhr5x7f8mr3clxq62nw5175gpamg5s172916nwv"; + url = mirror://xorg/X11R7.5/src/everything/setxkbmap-1.1.0.tar.bz2; + sha256 = "0r5g9wyyywp90hclhvqkiq6nbgrs0wrwcqvds76dzxjb98qjnbwk"; }; buildInputs = [pkgconfig libX11 libxkbfile ]; })) // {inherit libX11 libxkbfile ;}; smproxy = (stdenv.mkDerivation ((if overrides ? smproxy then overrides.smproxy else x: x) { - name = "smproxy-1.0.2"; + name = "smproxy-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/smproxy-1.0.2.tar.bz2; - sha256 = "1lk79yfdalpn0c7hm57vpr3xg6rib1dr6p2wl634733wy062zlkn"; + url = mirror://xorg/X11R7.5/src/everything/smproxy-1.0.3.tar.bz2; + sha256 = "0ddfsh2mf938xvac6179cnf8n8n47njb8xyrlyjc43r8hdad538v"; }; buildInputs = [pkgconfig libXmu libXt ]; })) // {inherit libXmu libXt ;}; - trapproto = (stdenv.mkDerivation ((if overrides ? trapproto then overrides.trapproto else x: x) { - name = "trapproto-3.4.3"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/trapproto-3.4.3.tar.bz2; - sha256 = "1qd06blxgah1pf49259gm9njpbqqk1gcisbv8p1ssv39pk9s0cpz"; - }; - buildInputs = [pkgconfig libXt ]; - })) // {inherit libXt ;}; - twm = (stdenv.mkDerivation ((if overrides ? twm then overrides.twm else x: x) { name = "twm-1.0.4"; builder = ./builder.sh; @@ -1138,731 +1068,701 @@ let })) // {inherit libICE libSM libX11 libXext libXmu libXt ;}; utilmacros = (stdenv.mkDerivation ((if overrides ? utilmacros then overrides.utilmacros else x: x) { - name = "util-macros-1.1.6"; + name = "util-macros-1.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/util-macros-1.1.6.tar.bz2; - sha256 = "0rjc3vsivrwbwlqnrsi57w5bdi7sb86wc5gzd7d1z0f4ylgcqgxh"; + url = mirror://xorg/X11R7.5/src/everything/util-macros-1.3.0.tar.bz2; + sha256 = "1akibdzirycdz1p2z7awngrqan7cc1waxq497jsgc10zp5ssm6bc"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; videoproto = (stdenv.mkDerivation ((if overrides ? videoproto then overrides.videoproto else x: x) { - name = "videoproto-2.2.2"; + name = "videoproto-2.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/videoproto-2.2.2.tar.bz2; - sha256 = "033q4jgrwgkdcwj5q8hwf7vpl5sdzm7z9dsgwcphrlqchdw8825b"; + url = mirror://xorg/X11R7.5/src/everything/videoproto-2.3.0.tar.bz2; + sha256 = "0pq46hgnrx459v7rlskzk50qi7llk358j9csbbrxcq0vb97cjasg"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; windowswmproto = (stdenv.mkDerivation ((if overrides ? windowswmproto then overrides.windowswmproto else x: x) { - name = "windowswmproto-1.0.3"; + name = "windowswmproto-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/windowswmproto-1.0.3.tar.bz2; - sha256 = "0lgih20hvpxzdvzwrw5plfynrkb2b930mnfymfnffbdvjsb283bq"; + url = mirror://xorg/X11R7.5/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"; + name = "x11perf-1.5.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/x11perf-1.5.tar.bz2; - sha256 = "0cqjrr1l1mcnbcx3lab73qmjxbvskcgpgfxlimsf3dz0vm9xlaa7"; + url = mirror://xorg/X11R7.5/src/everything/x11perf-1.5.1.tar.bz2; + sha256 = "0mkhzxvjn9n5ax013wj3lz7jmlm07l57ds2vxy2r9ylkkxbnlk5b"; }; 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.3"; + name = "xauth-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xauth-1.0.3.tar.bz2; - sha256 = "136sbgfirl9hxcg2a40z2xfs4f35z0f7nmxrkrja8km7zm9qpl8z"; + url = mirror://xorg/X11R7.5/src/everything/xauth-1.0.4.tar.bz2; + sha256 = "0nba0xg19y124cswy37ds5dmxfw4avd303xhhq5jf65vp34904gr"; }; 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"; + name = "xbacklight-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xbacklight-1.1.tar.bz2; - sha256 = "1934bnxa3hx0mzihv3bgcid6qrn75an03ci5dzhnjicp2lgh15f7"; + url = mirror://xorg/X11R7.5/src/everything/xbacklight-1.1.1.tar.bz2; + sha256 = "1ckgc3mbi5z3wv1fa9nf4yv028xh9911qkqz4f4h171vr28xhcjx"; }; buildInputs = [pkgconfig libX11 libXrandr libXrender ]; })) // {inherit libX11 libXrandr libXrender ;}; xbitmaps = (stdenv.mkDerivation ((if overrides ? xbitmaps then overrides.xbitmaps else x: x) { - name = "xbitmaps-1.0.1"; + name = "xbitmaps-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xbitmaps-1.0.1.tar.bz2; - sha256 = "0rxqxrnkivn52kk41a9bl1ppy756c5gw5w1rbnw75xvp9rcvx9as"; + url = mirror://xorg/X11R7.5/src/everything/xbitmaps-1.1.0.tar.bz2; + sha256 = "0qc7mmljabh06s4vkz9nkrca1d3f5yr7nr3927pbfdh6iff0b8n9"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; xcbproto = (stdenv.mkDerivation ((if overrides ? xcbproto then overrides.xcbproto else x: x) { - name = "xcb-proto-1.4"; + name = "xcb-proto-1.5"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-proto-1.4.tar.bz2; - sha256 = "1gars8dwbc9ffjs287rpwsvw5isv25r0ij298plfqj59ynvafl1d"; + url = http://xcb.freedesktop.org/dist/xcb-proto-1.5.tar.bz2; + sha256 = "0f269j48h545pp99j316ab0wmriyr8xfz5ykrcxpfclgiqjmpwqc"; }; buildInputs = [pkgconfig python ]; })) // {inherit python ;}; xcbutil = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) { - name = "xcb-util-0.3.4"; + name = "xcb-util-0.3.6"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-util-0.3.4.tar.bz2; - sha256 = "09ld81zibmhb64nirc97sys8k59sshqkf8ngqpcyd8azpvlj7dzf"; + url = http://xcb.freedesktop.org/dist/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.3"; + name = "xclock-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xclock-1.0.3.tar.bz2; - sha256 = "0zspx5jqp52wgp4c4d9qaxhp0b9p2fzx2ys4rza10apgx5x7gd8h"; + url = mirror://xorg/individual/app/xclock-1.0.4.tar.bz2; + sha256 = "1w7dwrxjwhllynvkvms236jnls8aik8g755kbpycj4aj62v07fb9"; }; - buildInputs = [pkgconfig libXaw libX11 libXft libxkbfile libXrender libXt ]; - })) // {inherit libXaw libX11 libXft libxkbfile libXrender libXt ;}; + buildInputs = [pkgconfig libX11 libXaw libXft libxkbfile libXrender libXt ]; + })) // {inherit libX11 libXaw libXft libxkbfile libXrender libXt ;}; xcmiscproto = (stdenv.mkDerivation ((if overrides ? xcmiscproto then overrides.xcmiscproto else x: x) { - name = "xcmiscproto-1.1.2"; + name = "xcmiscproto-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xcmiscproto-1.1.2.tar.bz2; - sha256 = "1awjhz3cc06zsds57qnjwgm3y7z5bl4l6akqy6xvfcnnm6b7x05j"; + url = mirror://xorg/X11R7.5/src/everything/xcmiscproto-1.2.0.tar.bz2; + sha256 = "13pnmizik323jdzdrhf3vyibmf63qmv4wcly8smyki85f1mw05yy"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; xcmsdb = (stdenv.mkDerivation ((if overrides ? xcmsdb then overrides.xcmsdb else x: x) { - name = "xcmsdb-1.0.1"; + name = "xcmsdb-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xcmsdb-1.0.1.tar.bz2; - sha256 = "0bp9xw2cmj9d0d18h5fdzcmc7jnjzbn5sb3vnx6qbbpz86gs6xg2"; + url = mirror://xorg/X11R7.5/src/everything/xcmsdb-1.0.2.tar.bz2; + sha256 = "1kps2q1gr9l168agqmsk6l9xp2b01qbs9j7i0wb4lkga6ikcdjmz"; }; buildInputs = [pkgconfig libX11 ]; })) // {inherit libX11 ;}; xcursorgen = (stdenv.mkDerivation ((if overrides ? xcursorgen then overrides.xcursorgen else x: x) { - name = "xcursorgen-1.0.2"; + name = "xcursorgen-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xcursorgen-1.0.2.tar.bz2; - sha256 = "0khp7i7w8b5835q7wfdg385x072fhwbnpjqvv558vvxgs8mk42g0"; + url = mirror://xorg/X11R7.5/src/everything/xcursorgen-1.0.3.tar.bz2; + sha256 = "0m62paz36b38bx9xpb79qmf9im1yamgmlvj0hp5gy88wi3z3ypzd"; }; 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.1"; + name = "xcursor-themes-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xcursor-themes-1.0.1.tar.bz2; - sha256 = "184ybhyb6wj082rvr83q4jnnx3g7f1i4kpm3s4dwwifh5i0cszaf"; + url = mirror://xorg/X11R7.5/src/everything/xcursor-themes-1.0.2.tar.bz2; + sha256 = "1mhlfnjdq5c0h9k2h088fq82bdsr0g2001x4l2gw15173lpqqyaz"; }; buildInputs = [pkgconfig libXcursor ]; })) // {inherit libXcursor ;}; xdpyinfo = (stdenv.mkDerivation ((if overrides ? xdpyinfo then overrides.xdpyinfo else x: x) { - name = "xdpyinfo-1.0.3"; + name = "xdpyinfo-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xdpyinfo-1.0.3.tar.bz2; - sha256 = "0qhr7r3q4hs7cjpxh8fjyjia35czbdxzrb7bwm3znkxxa63pd522"; + url = mirror://xorg/X11R7.5/src/everything/xdpyinfo-1.1.0.tar.bz2; + sha256 = "0c86d890bbdswhpnknlfn1xg5xbjgymjhnfk4vp44gv5cpz8s3bq"; }; - buildInputs = [pkgconfig libdmx libX11 libXext libXi libXinerama libXp libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ]; - })) // {inherit libdmx libX11 libXext libXi libXinerama libXp libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;}; + 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 ;}; xdriinfo = (stdenv.mkDerivation ((if overrides ? xdriinfo then overrides.xdriinfo else x: x) { - name = "xdriinfo-1.0.2"; + name = "xdriinfo-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xdriinfo-1.0.2.tar.bz2; - sha256 = "0rbj9s0jc265wzqz79q9dkqy7626dmby6qdd4266hybcbc4sq0vv"; + url = mirror://xorg/X11R7.5/src/everything/xdriinfo-1.0.3.tar.bz2; + sha256 = "1715vk6vhxdsn7ir3gd2gy90b4d31llddkysssgxg66713yjlxib"; }; buildInputs = [pkgconfig glproto libX11 ]; })) // {inherit glproto libX11 ;}; xev = (stdenv.mkDerivation ((if overrides ? xev then overrides.xev else x: x) { - name = "xev-1.0.3"; + name = "xev-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xev-1.0.3.tar.bz2; - sha256 = "0fiim4052r6jgzya9f2zixv2qdmrmf35bxd54yz375zfakhpmb6l"; + url = mirror://xorg/X11R7.5/src/everything/xev-1.0.4.tar.bz2; + sha256 = "1s7x06jw3y6blq4nfgm8m55jphp933idwcs6yivyc956anbrrbbz"; }; buildInputs = [pkgconfig libX11 ]; })) // {inherit libX11 ;}; xextproto = (stdenv.mkDerivation ((if overrides ? xextproto then overrides.xextproto else x: x) { - name = "xextproto-7.0.5"; + name = "xextproto-7.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/proto/xextproto-7.0.5.tar.bz2; - sha256 = "0hmhlmn6jv6ybv6q57s0377bvqrfrshi9z1dgdk7ibfsjqy1ygnk"; + url = mirror://xorg/X11R7.5/src/everything/xextproto-7.1.1.tar.bz2; + sha256 = "16adjr7hfzf5qaikrq7341p2g6n2nj8gvxgc9jr2qz6mvlqvs2kd"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; xeyes = (stdenv.mkDerivation ((if overrides ? xeyes then overrides.xeyes else x: x) { - name = "xeyes-1.0.1"; + name = "xeyes-1.0.991"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xeyes-1.0.1.tar.bz2; - sha256 = "0ac0m9af193lxpyj11k2sp2xpmlhzzn3xrs6kdyy6c11fgl042ak"; + url = mirror://xorg/individual/app/xeyes-1.0.991.tar.bz2; + sha256 = "05giiqnd90kxb3bmz5xpc2m8agf6lpgq99d908hm02mj9c8j8hsr"; }; - buildInputs = [pkgconfig libX11 libXext libXmu libXt ]; - })) // {inherit libX11 libXext libXmu libXt ;}; + buildInputs = [pkgconfig libX11 libXext libXmu libXrender libXt ]; + })) // {inherit libX11 libXext libXmu libXrender libXt ;}; xf86bigfontproto = (stdenv.mkDerivation ((if overrides ? xf86bigfontproto then overrides.xf86bigfontproto else x: x) { - name = "xf86bigfontproto-1.1.2"; + name = "xf86bigfontproto-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86bigfontproto-1.1.2.tar.bz2; - sha256 = "097i2l56kwgcd6033ng8j83xpx9pxlnwx53gvcwaf2bpnaspbd01"; + url = mirror://xorg/X11R7.5/src/everything/xf86bigfontproto-1.2.0.tar.bz2; + sha256 = "0j0n7sj5xfjpmmgx6n5x556rw21hdd18fwmavp95wps7qki214ms"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - xf86dga = (stdenv.mkDerivation ((if overrides ? xf86dga then overrides.xf86dga else x: x) { - name = "xf86dga-1.0.2"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86dga-1.0.2.tar.bz2; - sha256 = "0mqqrifbbfj2bh6hd187kmfzfn1rxgghmhsy9i6s5rcn6yw361k5"; - }; - buildInputs = [pkgconfig libX11 libXaw libXmu libXt libXxf86dga ]; - })) // {inherit libX11 libXaw libXmu libXt libXxf86dga ;}; - xf86dgaproto = (stdenv.mkDerivation ((if overrides ? xf86dgaproto then overrides.xf86dgaproto else x: x) { - name = "xf86dgaproto-2.0.3"; + name = "xf86dgaproto-2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86dgaproto-2.0.3.tar.bz2; - sha256 = "00mhjvbgkgr08d8drjavrvxyvnma5rddnmpxc5y74cmh12ix9i2s"; + url = mirror://xorg/X11R7.5/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.0.4"; + name = "xf86driproto-2.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86driproto-2.0.4.tar.bz2; - sha256 = "1nprqyd72f9hkmf4mdpmc9c9incps9p3y3jwx4pm0qw5ximsczgm"; + url = mirror://xorg/X11R7.5/src/everything/xf86driproto-2.1.0.tar.bz2; + sha256 = "1gp1vkzypwnd9lvn23vzazl6xxm77vgsgmkyi4p5hgnhzzg14gyj"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; xf86inputacecad = (stdenv.mkDerivation ((if overrides ? xf86inputacecad then overrides.xf86inputacecad else x: x) { - name = "xf86-input-acecad-1.2.2"; + name = "xf86-input-acecad-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-input-acecad-1.2.2.tar.bz2; - sha256 = "0vpj6ll76iw2qmpyqdh318ixhyn30x9s5xnnimjcwyfmgryvnglm"; + url = mirror://xorg/X11R7.5/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.1.1"; + name = "xf86-input-aiptek-1.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-input-aiptek-1.1.1.tar.bz2; - sha256 = "0xsxm003yxlpzlvrh964jpb1d890fgcr9z3ihhxk74sv4yq1d491"; + url = mirror://xorg/X11R7.5/src/everything/xf86-input-aiptek-1.3.0.tar.bz2; + sha256 = "0p2ygfh883wbwk5n1ippd7f562bwrsvbpgriqwvw7zqx0axkazxk"; }; 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.2.2"; + name = "xf86-input-evdev-2.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-evdev-2.2.2.tar.bz2; - sha256 = "156ragzgb67wpkc5vz2mczgiardp91h2njzcsxxv89vcx0cn2q33"; + url = mirror://xorg/X11R7.5/src/everything/xf86-input-evdev-2.3.0.tar.bz2; + sha256 = "1j36qckxn8pbj11da800ab4xrzwri6ygdidm5x7s20cjrq644mvd"; }; - buildInputs = [pkgconfig inputproto xorgserver xproto ]; - })) // {inherit inputproto xorgserver xproto ;}; + buildInputs = [pkgconfig xorgserver xproto ]; + })) // {inherit xorgserver xproto ;}; xf86inputjoystick = (stdenv.mkDerivation ((if overrides ? xf86inputjoystick then overrides.xf86inputjoystick else x: x) { - name = "xf86-input-joystick-1.3.2"; + name = "xf86-input-joystick-1.4.99.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-input-joystick-1.3.2.tar.bz2; - sha256 = "0jqxjka9gsp90js6273gn01jmkjg9dvw1y94a9fcgpjl1a727bbc"; + url = mirror://xorg/X11R7.5/src/everything/xf86-input-joystick-1.4.99.2.tar.bz2; + sha256 = "1fsjabi8221wi1xnqla1kdawng91h6s8nkhh992jsdk0hlxfj93j"; }; - buildInputs = [pkgconfig inputproto kbproto randrproto xorgserver xproto ]; - })) // {inherit inputproto kbproto randrproto xorgserver xproto ;}; + 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.3.1"; + name = "xf86-input-keyboard-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-input-keyboard-1.3.1.tar.bz2; - sha256 = "0hmyyg4rxlm9y0jma324hiqrv1zb14zvqm9kx8nm38mmvwalflbv"; + url = mirror://xorg/X11R7.5/src/everything/xf86-input-keyboard-1.4.0.tar.bz2; + sha256 = "19fnlr555pf5y0s01mlhski6v9rvsjzp6b2n5i7sppb8rb7kcbc4"; }; buildInputs = [pkgconfig inputproto kbproto randrproto xorgserver xproto ]; })) // {inherit inputproto kbproto randrproto xorgserver xproto ;}; xf86inputmouse = (stdenv.mkDerivation ((if overrides ? xf86inputmouse then overrides.xf86inputmouse else x: x) { - name = "xf86-input-mouse-1.3.0"; + name = "xf86-input-mouse-1.5.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-input-mouse-1.3.0.tar.bz2; - sha256 = "1v4xzx6ng72vl2jakdz1kjm5k7n78p2qpkhlay3c55b76qzjajq5"; + url = mirror://xorg/X11R7.5/src/everything/xf86-input-mouse-1.5.0.tar.bz2; + sha256 = "15xk3a6ld9zphqhfm1w69cmnsd13fz8k9xx70w7b4bxbf84f40zk"; }; buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; })) // {inherit inputproto randrproto xorgserver xproto ;}; xf86inputsynaptics = (stdenv.mkDerivation ((if overrides ? xf86inputsynaptics then overrides.xf86inputsynaptics else x: x) { - name = "xf86-input-synaptics-0.15.0"; + name = "xf86-input-synaptics-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-input-synaptics-0.15.0.tar.bz2; - sha256 = "12swi6sprhpy3k0wx2f6b0rdmgy2571r08zip1gga7d1fp1q3m77"; + url = mirror://xorg/X11R7.5/src/everything/xf86-input-synaptics-1.2.0.tar.bz2; + sha256 = "033232bvvy0ibr6w0fmcm3mjv212fl2bywj22d32wbxd4m6avmfx"; }; - buildInputs = [pkgconfig inputproto randrproto libX11 xorgserver xproto ]; - })) // {inherit inputproto randrproto libX11 xorgserver xproto ;}; + buildInputs = [pkgconfig inputproto recordproto libX11 libXi xorgserver xproto libXtst ]; + })) // {inherit inputproto recordproto libX11 libXi xorgserver xproto libXtst ;}; xf86inputvmmouse = (stdenv.mkDerivation ((if overrides ? xf86inputvmmouse then overrides.xf86inputvmmouse else x: x) { - name = "xf86-input-vmmouse-12.5.1"; + name = "xf86-input-vmmouse-12.6.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-input-vmmouse-12.5.1.tar.bz2; - sha256 = "1yzwgc5cac60zmhsw1npgn81sl06qda80bd0p6nixw1qf6h8nq33"; + url = mirror://xorg/X11R7.5/src/everything/xf86-input-vmmouse-12.6.5.tar.bz2; + sha256 = "03ccsqs5hyrjspfaww8dwia01iz98nczqj27bd1bpxs7vjww66iq"; }; 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.1.1"; + name = "xf86-input-void-1.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-input-void-1.1.1.tar.bz2; - sha256 = "0kxw5l0r4vp4xhfyb781lr9fmkjgv27yibhd3gaxjgvs4vb65q6x"; + url = mirror://xorg/X11R7.5/src/everything/xf86-input-void-1.3.0.tar.bz2; + sha256 = "03qk5gaw8msmi39m6024p61b0faw91b3vn257hdy40vpcggms5p2"; }; - buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; - })) // {inherit inputproto randrproto xorgserver xproto ;}; + buildInputs = [pkgconfig xorgserver xproto ]; + })) // {inherit xorgserver xproto ;}; xf86miscproto = (stdenv.mkDerivation ((if overrides ? xf86miscproto then overrides.xf86miscproto else x: x) { - name = "xf86miscproto-0.9.2"; + name = "xf86miscproto-0.9.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86miscproto-0.9.2.tar.bz2; - sha256 = "1rnnv8vi5z457wl5j184qw1z3ai3mvbwssdshm3ysgf736zlraxa"; + url = mirror://xorg/individual/proto/xf86miscproto-0.9.3.tar.bz2; + sha256 = "15dhcdpv61fyj6rhzrhnwri9hlw8rjfy05z1vik118lc99mfrf25"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; xf86videoapm = (stdenv.mkDerivation ((if overrides ? xf86videoapm then overrides.xf86videoapm else x: x) { - name = "xf86-video-apm-1.2.0"; + name = "xf86-video-apm-1.2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-apm-1.2.0.tar.bz2; - sha256 = "11b119a07w947hasvpmpzwmnfchv58qqc329d9lklvifi47h5zph"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-apm-1.2.2.tar.bz2; + sha256 = "0lhp3karp7v59p4i7lxk8yc5amsqihwa5pfcf9zpqphx7q3dv3k7"; }; 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.0"; + name = "xf86-video-ark-0.7.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-ark-0.7.0.tar.bz2; - sha256 = "153mynydgb1sa9xn0dvm5ynbsilkl2x9aj3dbz0kggps8lqffrcf"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-ark-0.7.2.tar.bz2; + sha256 = "0hap0q41bxq10a2jxbkpb93ad7zxbl1l64bcy4vjhf5xbvhz67nv"; }; 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.85.0"; + name = "xf86-video-ast-0.89.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-ast-0.85.0.tar.bz2; - sha256 = "0a2v91v61zn31ih0fizmsd3mz7f767xk7bbs0df8jvc6wj2gy64h"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-ast-0.89.9.tar.bz2; + sha256 = "00dllv1vs8xg9gbsabixsz846xd9y6ijibpl2ljhafip5b9ic3w8"; }; 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.2"; + name = "xf86-video-ati-6.12.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ati-6.12.2.tar.bz2; - sha256 = "0l17mv7ljw9cnvfblms62vnjkpd26gf5dqgdpfzvkxqrfyhvpvhv"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-ati-6.12.4.tar.bz2; + sha256 = "1xiqyf5pa8k0mva3ikq2i1xq8yn9lswmrsbr9xi9p8c7f1m0dpng"; }; 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 ;}; xf86videochips = (stdenv.mkDerivation ((if overrides ? xf86videochips then overrides.xf86videochips else x: x) { - name = "xf86-video-chips-1.2.0"; + name = "xf86-video-chips-1.2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-chips-1.2.0.tar.bz2; - sha256 = "16ag3n052rj275q10sf7j9dz1nxq43szlf5pd3x6mqrvn94qrwq5"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-chips-1.2.2.tar.bz2; + sha256 = "03kz0gvg0ryynj4pllbismb77aq2wmsy7zpk4cxynby6zwnfyvzz"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videocirrus = (stdenv.mkDerivation ((if overrides ? xf86videocirrus then overrides.xf86videocirrus else x: x) { - name = "xf86-video-cirrus-1.2.1"; + name = "xf86-video-cirrus-1.3.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-cirrus-1.2.1.tar.bz2; - sha256 = "175vg2gi149awz6jfnj1d51yq3s3ka2pbn75ysnmzpr6cgb9xjg7"; + url = mirror://xorg/X11R7.5/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.0"; + name = "xf86-video-dummy-0.3.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-dummy-0.3.0.tar.bz2; - sha256 = "0y52605g48wqpp138is2wfckdgk4w7v5x7hm7fv4nczhnzhbsjss"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-dummy-0.3.2.tar.bz2; + sha256 = "1yj5bk79lxdqrdivznqxpds7dh2fdx3d9anz1y990pqb3g1cp2ck"; }; 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.0"; + name = "xf86-video-fbdev-0.4.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-fbdev-0.4.0.tar.bz2; - sha256 = "179mmh0dzsq1y5i9y7sqr162r9wamslmaa5rya1knc9axgd2b9xv"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-fbdev-0.4.1.tar.bz2; + sha256 = "13r8nwl8z0kwqvgmiaj9wrjwid4d55cs1vn6qsf3lhr3jlbmgy1b"; }; 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.10.1"; + name = "xf86-video-geode-2.11.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-geode-2.10.1.tar.bz2; - sha256 = "0l66m0cc2ywwsgbx844gfdywc141gdjzyvpknavw3qh2whcghvlv"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-geode-2.11.6.tar.bz2; + sha256 = "148zfkxzw3g56wbhfix4ggw781szbay3rrrjgyji7nq8pi3xl6ja"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; xf86videoglide = (stdenv.mkDerivation ((if overrides ? xf86videoglide then overrides.xf86videoglide else x: x) { - name = "xf86-video-glide-1.0.1"; + name = "xf86-video-glide-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-glide-1.0.1.tar.bz2; - sha256 = "1cv4bwgbv37c0b1nm45pkmfjz07aj01qym2yw1r39z6qxja6hqrb"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-glide-1.0.3.tar.bz2; + sha256 = "1n76g133iq5pd8pll9k37j2szp8py2qmzr6w0r5jhd13lrazi1gi"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ]; })) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;}; xf86videoglint = (stdenv.mkDerivation ((if overrides ? xf86videoglint then overrides.xf86videoglint else x: x) { - name = "xf86-video-glint-1.2.1"; + name = "xf86-video-glint-1.2.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-glint-1.2.1.tar.bz2; - sha256 = "1nhwpv37h5790j3a08frwpy9m9p77376393w06i4h1bx2b9805qn"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-glint-1.2.4.tar.bz2; + sha256 = "0vypk7njd6927imi80akfyd6q2wl1d8ragg6p8sx4qf208xnx3az"; }; 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.1"; + name = "xf86-video-i128-1.3.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-i128-1.3.1.tar.bz2; - sha256 = "0xcspy2r8fy8daq47m1w3jrg92210x5m6gyjs1scvsslari27fs9"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-i128-1.3.3.tar.bz2; + sha256 = "0bmh6adk0pkzkcn0p4xkfi8r2hmya1rp2d6c0mfhfm1viv7921jd"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoi740 = (stdenv.mkDerivation ((if overrides ? xf86videoi740 then overrides.xf86videoi740 else x: x) { - name = "xf86-video-i740-1.2.0"; + name = "xf86-video-i740-1.3.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-i740-1.2.0.tar.bz2; - sha256 = "0vs831gnbfvlyqlxrmanjvdfy653460zzgr03hy07vsv8vpgdj2r"; + url = mirror://xorg/X11R7.5/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 ;}; - xf86videoimpact = (stdenv.mkDerivation ((if overrides ? xf86videoimpact then overrides.xf86videoimpact else x: x) { - name = "xf86-video-impact-0.2.0"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-impact-0.2.0.tar.bz2; - sha256 = "08h007qrz4k7pi6gcwfa5h35yfc6c18c6dwfxc32bx0vnhis2a0m"; - }; - buildInputs = [pkgconfig xorgserver xproto ]; - })) // {inherit xorgserver xproto ;}; - xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) { - name = "xf86-video-intel-2.7.1"; + name = "xf86-video-intel-2.9.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-intel-2.7.1.tar.bz2; - sha256 = "0hjziri3rkq7dbcqx70knbx9bips44ya8m1jfhpi7h4w4ia0sp15"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-intel-2.9.1.tar.bz2; + sha256 = "0xlxipmpfa49hpqj01d2h6qpzlmqs6nxzg5kgb042aschn47qd4m"; }; - buildInputs = [pkgconfig fontsproto glproto libdrm libpciaccess randrproto renderproto libX11 libXext xextproto xf86driproto xineramaproto xorgserver xproto libXvMC ]; - })) // {inherit fontsproto glproto libdrm libpciaccess randrproto renderproto libX11 libXext xextproto xf86driproto xineramaproto xorgserver xproto libXvMC ;}; + buildInputs = [pkgconfig dri2proto fontsproto glproto libdrm libpciaccess randrproto renderproto libX11 libXext xextproto xf86driproto libXfixes xineramaproto xorgserver xproto libXvMC ]; + })) // {inherit dri2proto fontsproto glproto libdrm libpciaccess randrproto renderproto libX11 libXext xextproto xf86driproto libXfixes xineramaproto xorgserver xproto libXvMC ;}; xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then overrides.xf86videomach64 else x: x) { - name = "xf86-video-mach64-6.8.0"; + name = "xf86-video-mach64-6.8.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-mach64-6.8.0.tar.bz2; - sha256 = "18g1hk9nq0zlinhw4vz3i9lhh9nql0w5x5lh1bh5j5rmipw1d9pv"; + url = mirror://xorg/X11R7.5/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.9"; + name = "xf86-video-mga-1.4.11"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-mga-1.4.9.tar.bz2; - sha256 = "1h7xs340q9vzdb6ck2z9c9fnxx3nfpxk58k7444n9w2j60rd4zfm"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-mga-1.4.11.tar.bz2; + sha256 = "1rlp1ywvcfk04p7h5n0s2pm7r4d7jkzr5nnv3pa78vs8dwqj46f9"; }; 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.1"; + name = "xf86-video-neomagic-1.2.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-neomagic-1.2.1.tar.bz2; - sha256 = "19g08nw8crbhkcm50i4n0vwkdhrazwilfp3kdkvp8qarg19qvqwn"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-neomagic-1.2.4.tar.bz2; + sha256 = "0lw3i7dkrg98dzjdci6yf4dn3a9j2rmd31hab7s46wh0dnca4ka3"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; xf86videonewport = (stdenv.mkDerivation ((if overrides ? xf86videonewport then overrides.xf86videonewport else x: x) { - name = "xf86-video-newport-0.2.1"; + name = "xf86-video-newport-0.2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-newport-0.2.1.tar.bz2; - sha256 = "026fn4c760rr03i2r9pq824k31nxq5nq0xq582bgh3k9a9a8bb36"; + url = mirror://xorg/X11R7.5/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.12"; + name = "xf86-video-nv-2.1.15"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-nv-2.1.12.tar.bz2; - sha256 = "07h1aih3gy9vpfqhs2wi1xjjk8jkijc31p3a7kfnjhvc5ys2nvgm"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-nv-2.1.15.tar.bz2; + sha256 = "0h9nbbp4dd4lcm9bjmfgv9p9pdq6hj535mnjf70xkkip0i0y1361"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoopenchrome = (stdenv.mkDerivation ((if overrides ? xf86videoopenchrome then overrides.xf86videoopenchrome else x: x) { - name = "xf86-video-openchrome-0.2.903"; + name = "xf86-video-openchrome-0.2.904"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-openchrome-0.2.903.tar.bz2; - sha256 = "043lvcvdkhyb5jp2m0ggd0r0gxndjwh2qnj8wbx2hr2wdf6qbr5p"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-openchrome-0.2.904.tar.bz2; + sha256 = "1sksddn0pc3izvab5ppxhprs1xzk5ijwqz5ylivx1cb5hg2gggf7"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 xextproto xf86driproto xorgserver xproto libXvMC ]; - })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 xextproto xf86driproto xorgserver xproto libXvMC ;}; + buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ]; + })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;}; xf86videor128 = (stdenv.mkDerivation ((if overrides ? xf86videor128 then overrides.xf86videor128 else x: x) { - name = "xf86-video-r128-6.8.0"; + name = "xf86-video-r128-6.8.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-r128-6.8.0.tar.bz2; - sha256 = "0ysnarxh4qz9hjk9zcgzb01w9whfgaq86a71prr9577f9xqwm2an"; + url = mirror://xorg/X11R7.5/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.0"; + name = "xf86-video-rendition-4.2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-rendition-4.2.0.tar.bz2; - sha256 = "05dfm9zlqnm89xmnx98rf3yrqi0i6frk23hpk6kk8xfq0zvn4yxm"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-rendition-4.2.3.tar.bz2; + sha256 = "152dfsjf75xbkl8a2xlpr1pl5365b3svhfj9y9dfxzi963ymjmcx"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; xf86videos3 = (stdenv.mkDerivation ((if overrides ? xf86videos3 then overrides.xf86videos3 else x: x) { - name = "xf86-video-s3-0.6.0"; + name = "xf86-video-s3-0.6.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-s3-0.6.0.tar.bz2; - sha256 = "0ry0ys83vzwkg9rwg2yc0zflkmkiz54kny33spfmyh0gidjf81zd"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-s3-0.6.3.tar.bz2; + sha256 = "0i2i1080cw3pxy1pm43bskb80n7wql0cxpyd2s61v0didsm6b7zd"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videos3virge = (stdenv.mkDerivation ((if overrides ? xf86videos3virge then overrides.xf86videos3virge else x: x) { - name = "xf86-video-s3virge-1.10.1"; + name = "xf86-video-s3virge-1.10.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-s3virge-1.10.1.tar.bz2; - sha256 = "12lp988y1gqgs3imj44vjm8wf9y7grqk4ww8rxbwjwzg45b1354h"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-s3virge-1.10.4.tar.bz2; + sha256 = "1f3zjs6a3j2a8lfdilijggpwbg9cs88qksrvzvd71ggxf5p0vl0w"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videosavage = (stdenv.mkDerivation ((if overrides ? xf86videosavage then overrides.xf86videosavage else x: x) { - name = "xf86-video-savage-2.2.1"; + name = "xf86-video-savage-2.3.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-savage-2.2.1.tar.bz2; - sha256 = "0zm3v0v2qbwldns6lvvhn4mhdvvf91hrwk0wqlk27xxs1yp5rydd"; + url = mirror://xorg/X11R7.5/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.6.0"; + name = "xf86-video-siliconmotion-1.7.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-siliconmotion-1.6.0.tar.bz2; - sha256 = "0lvy05jhj2csrn36hvffzzll63bk706mgf090mvs1fddqswh2lyc"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-siliconmotion-1.7.3.tar.bz2; + sha256 = "0aqb0sl2ds6n3wqq452xn6d5zkavryiks154xa6c1596wj5ldnpb"; }; 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.0"; + name = "xf86-video-sis-0.10.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-sis-0.10.0.tar.bz2; - sha256 = "0h2b1qk65mzahwir12b20rq16ayivhlsvq3n0r8c5726bpgdrh5w"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-sis-0.10.2.tar.bz2; + sha256 = "1hi8h7ixfbwhnqiara9xx5y6pzi3svnvma97j2dncmg3k4bp1b9s"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ]; - })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;}; + 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.0"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-sisusb-0.9.0.tar.bz2; - sha256 = "02lk6x8xf53p69kdzjwxkb9szi1n16znji9mwpibhd9vgndrrdvn"; - }; - buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xf86miscproto xineramaproto xorgserver xproto ]; - })) // {inherit fontsproto randrproto renderproto videoproto xextproto xf86miscproto xineramaproto xorgserver xproto ;}; - - xf86videosunbw2 = (stdenv.mkDerivation ((if overrides ? xf86videosunbw2 then overrides.xf86videosunbw2 else x: x) { - name = "xf86-video-sunbw2-1.1.0"; + name = "xf86-video-sisusb-0.9.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-sunbw2-1.1.0.tar.bz2; - sha256 = "0dl16ccbzzy0dchxzv4g7qjc59a2875c4lb68yn733xd87lp846p"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-sisusb-0.9.3.tar.bz2; + sha256 = "1clvnjkjzs2fmjm58fv31x6b5nk6y5ahb5vwvrizpm9irh7aky8x"; }; - buildInputs = [pkgconfig randrproto xorgserver xproto ]; - })) // {inherit randrproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ]; + })) // {inherit fontsproto randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ;}; xf86videosuncg14 = (stdenv.mkDerivation ((if overrides ? xf86videosuncg14 then overrides.xf86videosuncg14 else x: x) { - name = "xf86-video-suncg14-1.1.0"; + name = "xf86-video-suncg14-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-suncg14-1.1.0.tar.bz2; - sha256 = "09q5wjay9mn9msskawv4i5in3chqwv1a0qp4z54xn9g7f04jpjhy"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-suncg14-1.1.1.tar.bz2; + sha256 = "1n108xbwg803v2sk51galx66ph8wdb0ym84fx45h0jrr41wh0hyb"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; })) // {inherit fontsproto randrproto renderproto xorgserver xproto ;}; xf86videosuncg3 = (stdenv.mkDerivation ((if overrides ? xf86videosuncg3 then overrides.xf86videosuncg3 else x: x) { - name = "xf86-video-suncg3-1.1.0"; + name = "xf86-video-suncg3-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-suncg3-1.1.0.tar.bz2; - sha256 = "1ybxqf8z8q3r12s6pm1ygv0wffp9h7c6d4am8qnqgsnzrk4fnr1m"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-suncg3-1.1.1.tar.bz2; + sha256 = "06c4hzmd5cfzbw79yrv3knss80hllciamz734ij1pbzj6j6fjvym"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; })) // {inherit fontsproto randrproto renderproto xorgserver xproto ;}; xf86videosuncg6 = (stdenv.mkDerivation ((if overrides ? xf86videosuncg6 then overrides.xf86videosuncg6 else x: x) { - name = "xf86-video-suncg6-1.1.0"; + name = "xf86-video-suncg6-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-suncg6-1.1.0.tar.bz2; - sha256 = "0jqr6xjs6i8lb40qyiqnyrfzmy9ch53jhjr0w20m5vspkjvz7cfn"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-suncg6-1.1.1.tar.bz2; + sha256 = "07w0hm63fiy5l3cpcjsl0ig8z84z9r36xm0cmnpiv3g75dy6q8fi"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; })) // {inherit fontsproto randrproto renderproto xorgserver xproto ;}; xf86videosunffb = (stdenv.mkDerivation ((if overrides ? xf86videosunffb then overrides.xf86videosunffb else x: x) { - name = "xf86-video-sunffb-1.2.0"; + name = "xf86-video-sunffb-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-sunffb-1.2.0.tar.bz2; - sha256 = "14lj0myf4dbd8c02qwgli6lj7rwlhv2q2d3krsqdd94r4gygiwjr"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-sunffb-1.2.1.tar.bz2; + sha256 = "04byax4sc1fn183vyyq0q11q730k16h2by4ggjky7s36wgv7ldzx"; }; - buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto xextproto xf86driproto xorgserver xproto ]; - })) // {inherit fontsproto libdrm randrproto renderproto xextproto xf86driproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ]; + })) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;}; xf86videosunleo = (stdenv.mkDerivation ((if overrides ? xf86videosunleo then overrides.xf86videosunleo else x: x) { name = "xf86-video-sunleo-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-sunleo-1.2.0.tar.bz2; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-sunleo-1.2.0.tar.bz2; sha256 = "01kffjbshmwix2cdb95j0cx2qmrss6yfjj7y5qssw83h36bvw5dk"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; })) // {inherit fontsproto randrproto renderproto xorgserver xproto ;}; xf86videosuntcx = (stdenv.mkDerivation ((if overrides ? xf86videosuntcx then overrides.xf86videosuntcx else x: x) { - name = "xf86-video-suntcx-1.1.0"; + name = "xf86-video-suntcx-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-suntcx-1.1.0.tar.bz2; - sha256 = "1kq1gg273x460rin8gh5spl7yhyv23b4795by46zcimph4wnm63j"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-suntcx-1.1.1.tar.bz2; + sha256 = "07lqah5sizhwjpzr4vcpwgvbl86fwz4k0c3skp63sq58ng21acal"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; })) // {inherit fontsproto randrproto renderproto xorgserver xproto ;}; xf86videotdfx = (stdenv.mkDerivation ((if overrides ? xf86videotdfx then overrides.xf86videotdfx else x: x) { - name = "xf86-video-tdfx-1.4.0"; + name = "xf86-video-tdfx-1.4.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-tdfx-1.4.0.tar.bz2; - sha256 = "1bfy02461j3r48b1xf5vbpkgncha33bi0fr43z79xr7j4k9hdgn3"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-tdfx-1.4.3.tar.bz2; + sha256 = "0cxz1rsc87cnf0ba1zfwhk0lhfas92ysc9b13q6x21m31b53bn9s"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videotga = (stdenv.mkDerivation ((if overrides ? xf86videotga then overrides.xf86videotga else x: x) { - name = "xf86-video-tga-1.2.0"; + name = "xf86-video-tga-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-tga-1.2.0.tar.bz2; - sha256 = "19mfy468brrp75gy3y0bnyq1jmqdllq9z6kicpj8nc911snqqbx9"; + url = mirror://xorg/X11R7.5/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.0"; + name = "xf86-video-trident-1.3.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-trident-1.3.0.tar.bz2; - sha256 = "1dfxscqv03b65p6jq2lzzyq3ihyx26i85rqh3wn3rsgn8sgnrxm4"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-trident-1.3.3.tar.bz2; + sha256 = "1x8ibnkq6vv9ify1alc65hj5c8np7bii9dp61cw7b87hyfvflhb2"; }; 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.0"; + name = "xf86-video-tseng-1.2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-tseng-1.2.0.tar.bz2; - sha256 = "1qxi325a4cr8bjhnw6c3pb960kxcl1k0q39kmh090cil148dk40h"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-tseng-1.2.3.tar.bz2; + sha256 = "11via1r9b3x0cfa0ys44w9hff9s5a2wf50hgi1zfhjysg4zbnmh5"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1871,198 +1771,188 @@ let name = "xf86-video-v4l-0.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-v4l-0.2.0.tar.bz2; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-v4l-0.2.0.tar.bz2; sha256 = "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb"; }; buildInputs = [pkgconfig randrproto videoproto xorgserver xproto ]; })) // {inherit randrproto videoproto xorgserver xproto ;}; - xf86videovermilion = (stdenv.mkDerivation ((if overrides ? xf86videovermilion then overrides.xf86videovermilion else x: x) { - name = "xf86-video-vermilion-1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-vermilion-1.0.1.tar.bz2; - sha256 = "12qdk0p2r0pbmsl8fkgwhfh7szvb20yjaay88jlvb89rsbc4rssg"; - }; - buildInputs = [pkgconfig fontsproto renderproto xextproto xf86dgaproto xorgserver xproto ]; - })) // {inherit fontsproto renderproto xextproto xf86dgaproto xorgserver xproto ;}; - xf86videovesa = (stdenv.mkDerivation ((if overrides ? xf86videovesa then overrides.xf86videovesa else x: x) { - name = "xf86-video-vesa-2.2.0"; + name = "xf86-video-vesa-2.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-vesa-2.2.0.tar.bz2; - sha256 = "09h2x02h05skg9mhknhla2xpzz1igym4gimiswrj0wil4myhfglb"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-vesa-2.2.1.tar.bz2; + sha256 = "100hljpkml6dfk4rw2gpb78z8gkdv3nqlyjiwyrpv71f4dqpjrd3"; }; 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-10.16.5"; + name = "xf86-video-vmware-10.16.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-vmware-10.16.5.tar.bz2; - sha256 = "0rj32zsn8p61vxg01rzgvnjby4xpjg6cmxiy11v61cq6v2zrlkiy"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-vmware-10.16.8.tar.bz2; + sha256 = "01yslyg4d16baw11zdnq453bm7ydya7wpn2n02dlbxwlina46r4m"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ;}; xf86videovoodoo = (stdenv.mkDerivation ((if overrides ? xf86videovoodoo then overrides.xf86videovoodoo else x: x) { - name = "xf86-video-voodoo-1.2.0"; + name = "xf86-video-voodoo-1.2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-voodoo-1.2.0.tar.bz2; - sha256 = "132bgkj2jans4psp0pw4326dgwj7dx9prqwb1z07019hskasd6xp"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-voodoo-1.2.3.tar.bz2; + sha256 = "1s99ms9kjb1ypq8ra340iyc14x3mkh4vpbbz85r5nchrmfclsp82"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;}; xf86videowsfb = (stdenv.mkDerivation ((if overrides ? xf86videowsfb then overrides.xf86videowsfb else x: x) { - name = "xf86-video-wsfb-0.2.1"; + name = "xf86-video-wsfb-0.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-wsfb-0.2.1.tar.bz2; - sha256 = "0j6ij0yzz7car00x8h3xpmz2s86apvkvk0lcl9hzaffr2ym5iqrr"; + url = mirror://xorg/X11R7.5/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.0"; + name = "xf86-video-xgi-1.5.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-xgi-1.5.0.tar.bz2; - sha256 = "154ilsc7vaphfh5ab5iy27pwdswbynsshkblji2c0h49xqr39cjz"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-xgi-1.5.1.tar.bz2; + sha256 = "064yginmdlcrk09rmwgbjn1jvgm38j9prfhmzv25yd4xgwlga6fb"; }; 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.3"; + name = "xf86-video-xgixp-1.7.99.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86-video-xgixp-1.7.99.3.tar.bz2; - sha256 = "1n5v9wcdfp3k3r1xhicg2cw0xr73y3wciagpif7apl7awf76b88k"; + url = mirror://xorg/X11R7.5/src/everything/xf86-video-xgixp-1.7.99.4.tar.bz2; + sha256 = "15bk90pr8xcwiva1bhfmqz3qjyycwnid4x7iwrwxc47zi661f2pf"; }; 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.2.2"; + name = "xf86vidmodeproto-2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xf86vidmodeproto-2.2.2.tar.bz2; - sha256 = "0vnrqhzrsyjh77zgrxlgx53r34dij15crpl9369wb7n71jcjy587"; + url = mirror://xorg/X11R7.5/src/everything/xf86vidmodeproto-2.3.tar.bz2; + sha256 = "0iy25ayr105x5b6yfi1a2xvmgc7jaghghp6hjk2k2ys0ll9lcw4g"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; xfs = (stdenv.mkDerivation ((if overrides ? xfs then overrides.xfs else x: x) { - name = "xfs-1.0.8"; + name = "xfs-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xfs-1.0.8.tar.bz2; - sha256 = "10plnkkblkzrvnxszkvpbpm1fwjvrqkgjipsrp0jymdp7l5h9d9l"; + url = mirror://xorg/individual/app/xfs-1.1.0.tar.bz2; + sha256 = "0vazp4p2c9xayd1gdmlqqhklsv0770sgwvmafgjsi204rnxx9fj7"; }; 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.2"; + name = "xgamma-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xgamma-1.0.2.tar.bz2; - sha256 = "07plrky99vwp13463zbp2fqmyfqkvmxc2ra8iypfy2n61wimngax"; + url = mirror://xorg/X11R7.5/src/everything/xgamma-1.0.3.tar.bz2; + sha256 = "06kf7r0fq1gn2sw6rb0mxlpc5ac78hh09cviapdw5idxzf42bsz5"; }; buildInputs = [pkgconfig libX11 libXxf86vm ]; })) // {inherit libX11 libXxf86vm ;}; xhost = (stdenv.mkDerivation ((if overrides ? xhost then overrides.xhost else x: x) { - name = "xhost-1.0.2"; + name = "xhost-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xhost-1.0.2.tar.bz2; - sha256 = "1dhdm6dz2jcnb08qlrjn2g1mzv3gfbyq6yqg9kjmh3r3kp22razd"; + url = mirror://xorg/X11R7.5/src/everything/xhost-1.0.3.tar.bz2; + sha256 = "05xd6j8l120kcz4vz9pdrv1wnfhkq2rlagizliry57z8cmy00qrd"; }; buildInputs = [pkgconfig libX11 libXau libXmu ]; })) // {inherit libX11 libXau libXmu ;}; xineramaproto = (stdenv.mkDerivation ((if overrides ? xineramaproto then overrides.xineramaproto else x: x) { - name = "xineramaproto-1.1.2"; + name = "xineramaproto-1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xineramaproto-1.1.2.tar.bz2; - sha256 = "0409qj8wdl1c3jchrqvdkl63s8r08gni4xhlxngkpz5wmwf2p9p8"; + url = mirror://xorg/X11R7.5/src/everything/xineramaproto-1.2.tar.bz2; + sha256 = "0r5slwkj8h8v548ysgwhm6idqnij8w96nkgr33ch2wpcrs3q1s2q"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; xinput = (stdenv.mkDerivation ((if overrides ? xinput then overrides.xinput else x: x) { - name = "xinput-1.3.0"; + name = "xinput-1.5.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xinput-1.3.0.tar.bz2; - sha256 = "0i9fh3flmigv7smfg879969kckw0c1h4ab0n3h9mdwmbi18kw31k"; + url = mirror://xorg/X11R7.5/src/everything/xinput-1.5.0.tar.bz2; + sha256 = "1yfazyhjdy49fwdlzxximbapliniibs8jm0vripd7vdm9gijhix8"; }; 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.0.5"; + name = "xkbcomp-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xkbcomp-1.0.5.tar.bz2; - sha256 = "1h809xl9kpx0r9ynvjfk7wy6rx8pgl1i14qh29r150wf73h06i10"; + url = mirror://xorg/X11R7.5/src/everything/xkbcomp-1.1.1.tar.bz2; + sha256 = "0qz6hbypcv350cqrnlks7ncby6gl6g4v5rb550ga9zyr8gyvqxcp"; }; buildInputs = [pkgconfig libX11 libxkbfile ]; })) // {inherit libX11 libxkbfile ;}; xkbevd = (stdenv.mkDerivation ((if overrides ? xkbevd then overrides.xkbevd else x: x) { - name = "xkbevd-1.0.2"; + name = "xkbevd-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xkbevd-1.0.2.tar.bz2; - sha256 = "0azpl6mcvsi718630vv0slls8avixvlsfd7nj614kagrxhbf6y2b"; + url = mirror://xorg/X11R7.5/src/everything/xkbevd-1.1.0.tar.bz2; + sha256 = "1px26hmn4rv1m997r7bg01w2viaybxgsm4ddahwz27rj43fpl0s6"; }; buildInputs = [pkgconfig libX11 libxkbfile ]; })) // {inherit libX11 libxkbfile ;}; xkbutils = (stdenv.mkDerivation ((if overrides ? xkbutils then overrides.xkbutils else x: x) { - name = "xkbutils-1.0.1"; + name = "xkbutils-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xkbutils-1.0.1.tar.bz2; - sha256 = "0mjq2yfd1kp3gasc08k6r0q16k4asdsafsxw3259fr5pipnp7bda"; + url = mirror://xorg/X11R7.5/src/everything/xkbutils-1.0.2.tar.bz2; + sha256 = "1vhbqyqgvdzkqlkvj80sg6w4phk8f21g6n8n5djb5pm4ji2pv8qj"; }; - buildInputs = [pkgconfig libXaw libX11 libxkbfile ]; - })) // {inherit libXaw libX11 libxkbfile ;}; + buildInputs = [pkgconfig inputproto libX11 libXaw libxkbfile ]; + })) // {inherit inputproto libX11 libXaw libxkbfile ;}; xkill = (stdenv.mkDerivation ((if overrides ? xkill then overrides.xkill else x: x) { - name = "xkill-1.0.1"; + name = "xkill-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xkill-1.0.1.tar.bz2; - sha256 = "1pm92hpq1vnj3zjl12x8d9g6a9nyfyz3ahvvicni7qjadsn1m8bp"; + url = mirror://xorg/X11R7.5/src/everything/xkill-1.0.2.tar.bz2; + sha256 = "09sskbg2njl52kq7x8l95m7sfg195b06f0wdp8fankizilwz0bak"; }; buildInputs = [pkgconfig libX11 libXmu ]; })) // {inherit libX11 libXmu ;}; xlsatoms = (stdenv.mkDerivation ((if overrides ? xlsatoms then overrides.xlsatoms else x: x) { - name = "xlsatoms-1.0.1"; + name = "xlsatoms-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xlsatoms-1.0.1.tar.bz2; - sha256 = "0nnm2ss1v93wz4jmlvhgxfsrxkx39g9km2jp2nagqdyv1id5fva5"; + url = mirror://xorg/X11R7.5/src/everything/xlsatoms-1.0.2.tar.bz2; + sha256 = "06qjbhph27jwbp7w5iiqk6ka6h2g2nk5x9x8ilpab8jy5rldfv6n"; }; buildInputs = [pkgconfig libX11 libXmu ]; })) // {inherit libX11 libXmu ;}; xlsclients = (stdenv.mkDerivation ((if overrides ? xlsclients then overrides.xlsclients else x: x) { - name = "xlsclients-1.0.1"; + name = "xlsclients-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xlsclients-1.0.1.tar.bz2; - sha256 = "160nk39dj9h5laxd0gbq7jl47y4ikpjf6kl4wlzm469mvk37334q"; + url = mirror://xorg/X11R7.5/src/everything/xlsclients-1.0.2.tar.bz2; + sha256 = "163ni1f71gq24gm83pmqha81r44qprqv7j2b07gngk2gkp9cs9w5"; }; buildInputs = [pkgconfig libX11 libXmu ]; })) // {inherit libX11 libXmu ;}; @@ -2078,191 +1968,181 @@ let })) // {inherit libXaw libXt ;}; xmodmap = (stdenv.mkDerivation ((if overrides ? xmodmap then overrides.xmodmap else x: x) { - name = "xmodmap-1.0.3"; + name = "xmodmap-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xmodmap-1.0.3.tar.bz2; - sha256 = "0zql66q2l8wbldfrzz53vlxpv7p62yhfj6lc2cn24n18g4jcggy3"; + url = mirror://xorg/X11R7.5/src/everything/xmodmap-1.0.4.tar.bz2; + sha256 = "1v8bpp3svyza9nn3f8jlilf01nwwzchr3a0sl5h9vxcrbm966nl0"; }; buildInputs = [pkgconfig libX11 ]; })) // {inherit libX11 ;}; xorgcffiles = (stdenv.mkDerivation ((if overrides ? xorgcffiles then overrides.xorgcffiles else x: x) { - name = "xorg-cf-files-1.0.2"; + name = "xorg-cf-files-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/xorg-cf-files-1.0.2.tar.bz2; - sha256 = "15wmz9whf0j9irz5scqyyic4ardr53r6k15x2wcnxmfkqap16ip3"; + url = mirror://xorg/individual/util/xorg-cf-files-1.0.3.tar.bz2; + sha256 = "02z2w72bwa1hvjyp7ilw37qs2zbr7cggabq18jzdpb4dzgcdwcmw"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; xorgdocs = (stdenv.mkDerivation ((if overrides ? xorgdocs then overrides.xorgdocs else x: x) { - name = "xorg-docs-1.4"; + name = "xorg-docs-1.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xorg-docs-1.4.tar.bz2; - sha256 = "09a9va5nljg0cahajadpkkqbhm0r6nl2z12yv7fyd5p31kjngz7z"; + url = mirror://xorg/X11R7.5/src/everything/xorg-docs-1.5.tar.bz2; + sha256 = "1z7afnz0cxla7dz9gj95vwrwzqph7w90kd6d5ah7dbcp5rc67k32"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) { - name = "xorg-server-1.5.3"; + name = "xorg-server-1.7.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.5.3.tar.bz2; - sha256 = "1fymhb0v83hmbka1sdg9z2vfkjagskawaxajks0n6xxyai7ig056"; + url = mirror://xorg/X11R7.5/src/everything/xorg-server-1.7.1.tar.bz2; + sha256 = "082c7d8xhb9zm063r01ja442mvfi9alp1vn538d7saxxkki0v355"; }; - buildInputs = [pkgconfig renderproto bigreqsproto compositeproto damageproto dbus libdmx dmxproto dri2proto evieext fixesproto fontcacheproto libfontenc fontsproto freetype mesa glproto hal inputproto kbproto libdrm mkfontdir mkfontscale openssl libpciaccess perl pixman printproto randrproto recordproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXv libXxf86misc libXxf86vm ]; - })) // {inherit renderproto bigreqsproto compositeproto damageproto dbus libdmx dmxproto dri2proto evieext fixesproto fontcacheproto libfontenc fontsproto freetype mesa glproto hal inputproto kbproto libdrm mkfontdir mkfontscale openssl libpciaccess perl pixman printproto randrproto recordproto resourceproto scrnsaverproto trapproto videoproto libX11 libXau libXaw xcmiscproto libXdmcp libXext xextproto xf86dgaproto xf86driproto xf86miscproto xf86vidmodeproto libXfixes libXfont libXi xineramaproto libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXtst libXv libXxf86misc libXxf86vm ;}; + buildInputs = [pkgconfig bigreqsproto damageproto dbus fixesproto fontsproto hal 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 hal 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 ;}; xorgsgmldoctools = (stdenv.mkDerivation ((if overrides ? xorgsgmldoctools then overrides.xorgsgmldoctools else x: x) { - name = "xorg-sgml-doctools-1.2"; + name = "xorg-sgml-doctools-1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xorg-sgml-doctools-1.2.tar.bz2; - sha256 = "1snvlijv7ycdis0m7zhl6q6ibg2z6as3mdb17dlza0p0w3r7ivsd"; + url = mirror://xorg/X11R7.5/src/everything/xorg-sgml-doctools-1.3.tar.bz2; + sha256 = "1cnvfmdnyadh56sj29snz5k94zjbnf9aiad6l8dsdi2dm2gjgh6m"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; xpr = (stdenv.mkDerivation ((if overrides ? xpr then overrides.xpr else x: x) { - name = "xpr-1.0.2"; + name = "xpr-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xpr-1.0.2.tar.bz2; - sha256 = "1pwa4dcs7zw4iw52p23swnnq1idipfiadhpih6k47nhwdn4sj9f3"; + url = mirror://xorg/X11R7.5/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.0.4"; + name = "xprop-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xprop-1.0.4.tar.bz2; - sha256 = "0wnpbigsl5frbh2xnjzdxmvlz47lda5qlg85pnhrr4asgnx7r96s"; + url = mirror://xorg/X11R7.5/src/everything/xprop-1.1.0.tar.bz2; + sha256 = "09k2qvfg5fvya8a26082ks3laif5fa9a3zdg7c8mz2bl2n80g3nc"; }; buildInputs = [pkgconfig libX11 ]; })) // {inherit libX11 ;}; xproto = (stdenv.mkDerivation ((if overrides ? xproto then overrides.xproto else x: x) { - name = "xproto-7.0.15"; + name = "xproto-7.0.16"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/proto/xproto-7.0.15.tar.bz2; - sha256 = "1vkbqy2vs0jf1z043fyjw1345rmh16lxzvgrd9p43mwl7syd137x"; + url = mirror://xorg/X11R7.5/src/everything/xproto-7.0.16.tar.bz2; + sha256 = "0wlnxg51mz9zrdsx2zxr5mw56i5vcbnz69d30x7fs3cww4fdl942"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; xrandr = (stdenv.mkDerivation ((if overrides ? xrandr then overrides.xrandr else x: x) { - name = "xrandr-1.2.3"; + name = "xrandr-1.3.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xrandr-1.2.3.tar.bz2; - sha256 = "01r22ngikdsfkv1sxc2f8a0lcr5c08krsvq9kqknd21b79zvf1mb"; + url = mirror://xorg/X11R7.5/src/everything/xrandr-1.3.2.tar.bz2; + sha256 = "0j92j67067l6nj1nhfwdik7c14cgxdzn9f0v2irlajd68i337m1l"; }; 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.5"; + name = "xrdb-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xrdb-1.0.5.tar.bz2; - sha256 = "1ah00m82pc8yv5knp8szqnlip450pw3lg60vzlw05wahja9hhkf2"; + url = mirror://xorg/X11R7.5/src/everything/xrdb-1.0.6.tar.bz2; + sha256 = "16gwcvpp93mn65dqg5ijc5yns7mglsnabx2dn4icypv6chvjl1ld"; }; buildInputs = [pkgconfig libX11 libXmu ]; })) // {inherit libX11 libXmu ;}; xrefresh = (stdenv.mkDerivation ((if overrides ? xrefresh then overrides.xrefresh else x: x) { - name = "xrefresh-1.0.2"; + name = "xrefresh-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xrefresh-1.0.2.tar.bz2; - sha256 = "1x9jdgwbd1ying44apk718h1ycbfx411p81mjzr51cn057yk2a2j"; + url = mirror://xorg/X11R7.5/src/everything/xrefresh-1.0.3.tar.bz2; + sha256 = "1nbyglx05jjz1yjj50x5w449z9f90rw8xzzwrbxvyjximvvsbq1y"; }; buildInputs = [pkgconfig libX11 ]; })) // {inherit libX11 ;}; xset = (stdenv.mkDerivation ((if overrides ? xset then overrides.xset else x: x) { - name = "xset-1.0.4"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xset-1.0.4.tar.bz2; - sha256 = "1bdxs24pf7g73n55a967fr96f9i5ilci5nzh32wr5axy6sxp8gkc"; - }; - buildInputs = [pkgconfig libX11 libXext libXfontcache libXmu libXp libXxf86misc ]; - })) // {inherit libX11 libXext libXfontcache libXmu libXp libXxf86misc ;}; - - xsetmode = (stdenv.mkDerivation ((if overrides ? xsetmode then overrides.xsetmode else x: x) { - name = "xsetmode-1.0.0"; + name = "xset-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xsetmode-1.0.0.tar.bz2; - sha256 = "1am0mylym97m79n54jvlc45njxdchv1mvqdwmpkcd499jb6lg2wq"; + url = mirror://xorg/X11R7.5/src/everything/xset-1.1.0.tar.bz2; + sha256 = "0hs6amxfjbqp2y6bxxihmfnhxral6isb5l18z1fa54080g35kj3j"; }; - buildInputs = [pkgconfig libX11 libXi ]; - })) // {inherit libX11 libXi ;}; + buildInputs = [pkgconfig libX11 libXext libXmu libXp libXxf86misc ]; + })) // {inherit libX11 libXext libXmu libXp libXxf86misc ;}; xsetroot = (stdenv.mkDerivation ((if overrides ? xsetroot then overrides.xsetroot else x: x) { - name = "xsetroot-1.0.2"; + name = "xsetroot-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xsetroot-1.0.2.tar.bz2; - sha256 = "079mld5c05dx2xwhncc94xhrkp4n9388xdncx3x7km1h90gpb6jg"; + url = mirror://xorg/X11R7.5/src/everything/xsetroot-1.0.3.tar.bz2; + sha256 = "0j4gfa6f177hy230fb0gnnj6ibkwbmh9x7rwrmgspqvdd3615rfp"; }; buildInputs = [pkgconfig libX11 xbitmaps libXmu ]; })) // {inherit libX11 xbitmaps libXmu ;}; xtrans = (stdenv.mkDerivation ((if overrides ? xtrans then overrides.xtrans else x: x) { - name = "xtrans-1.2.1"; + name = "xtrans-1.2.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xtrans-1.2.1.tar.bz2; - sha256 = "1gb4vyh6b4lybacvipjyqfqj1jxl4bav9mmngjdwl955ks6imwlz"; + url = mirror://xorg/X11R7.5/src/everything/xtrans-1.2.5.tar.bz2; + sha256 = "1688p5v9jalykyj97jv34a6mxfipa7givb7fvbjpd0fsyj8s6wfc"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; xvinfo = (stdenv.mkDerivation ((if overrides ? xvinfo then overrides.xvinfo else x: x) { - name = "xvinfo-1.0.2"; + name = "xvinfo-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xvinfo-1.0.2.tar.bz2; - sha256 = "0l7i9h3r0lzb6kmmcp751i92xml84rhzmz04i5lgj8y759hjlvhj"; + url = mirror://xorg/X11R7.5/src/everything/xvinfo-1.1.0.tar.bz2; + sha256 = "1yvfx1lli1k90h8ww0krgd9y3cr0c47nklmr5b6daayrl1n8yc8a"; }; buildInputs = [pkgconfig libX11 libXv ]; })) // {inherit libX11 libXv ;}; xwd = (stdenv.mkDerivation ((if overrides ? xwd then overrides.xwd else x: x) { - name = "xwd-1.0.2"; + name = "xwd-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xwd-1.0.2.tar.bz2; - sha256 = "0qbz63lwdp7c8x0rbafamlja7pk3ahhmcim5cnd7m5f123h792db"; + url = mirror://xorg/X11R7.5/src/everything/xwd-1.0.3.tar.bz2; + sha256 = "1zg3grx6sjm2w1aqyn80k7qvf9p00pp0k4ihsiil8mbc13mdpwpz"; }; buildInputs = [pkgconfig libX11 ]; })) // {inherit libX11 ;}; xwininfo = (stdenv.mkDerivation ((if overrides ? xwininfo then overrides.xwininfo else x: x) { - name = "xwininfo-1.0.4"; + name = "xwininfo-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xwininfo-1.0.4.tar.bz2; - sha256 = "1r4f898f6xydg02n1m37qgibh49bffn0fwdxwww37k9jhrw556nz"; + url = mirror://xorg/X11R7.5/src/everything/xwininfo-1.0.5.tar.bz2; + sha256 = "1nfw5jj67g0vnmq5l7622agb3c27jzgl2vbcrsnfgi0bgcdbidld"; }; buildInputs = [pkgconfig libX11 libXext ]; })) // {inherit libX11 libXext ;}; xwud = (stdenv.mkDerivation ((if overrides ? xwud then overrides.xwud else x: x) { - name = "xwud-1.0.1"; + name = "xwud-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.4/src/everything/xwud-1.0.1.tar.bz2; - sha256 = "0v1kjdn5y7dh3fcp46z1m90i9d3xx1k1y4rdr6nj77j7nhwjvpnj"; + url = mirror://xorg/X11R7.5/src/everything/xwud-1.0.2.tar.bz2; + sha256 = "1h8ap7c29yib6fza2qgbf6pl11km0wjdmairjrl13i0dzzxmsd44"; }; buildInputs = [pkgconfig libX11 ]; })) // {inherit libX11 ;}; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index 59e327af48d7b..64267ec39f9d9 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -1,6 +1,5 @@ -http://xcb.freedesktop.org/dist/xcb-proto-1.4.tar.bz2 -http://xcb.freedesktop.org/dist/xcb-util-0.3.4.tar.bz2 -http://xcb.freedesktop.org/dist/libpthread-stubs-0.1.tar.bz2 -http://xcb.freedesktop.org/dist/libxcb-1.2.tar.bz2 -mirror://xorg/individual/lib/pixman-0.15.2.tar.bz2 -mirror://xorg/individual/proto/dri2proto-2.0.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-proto-1.5.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-util-0.3.6.tar.bz2 +http://xcb.freedesktop.org/dist/libxcb-1.4.tar.bz2 +http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2 +mirror://xorg/individual/lib/pixman-0.16.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 cbd324c418b40..e3473fa6b14bc 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -146,6 +146,27 @@ while (<>) { $extraAttrs{$pkg} = " preInstall = \"installFlags=(FCCACHE=true)\"; "; } + my $isFont; + + if ($file =~ /XORG_FONT_BDF_UTILS/) { + push @requires, "bdftopcf", "mkfontdir"; + $isFont = 1; + } + + if ($file =~ /XORG_FONT_SCALED_UTILS/) { + push @requires, "mkfontscale", "mkfontdir"; + $isFont = 1; + } + + if ($file =~ /XORG_FONT_UCS2ANY/) { + push @requires, "fontutil"; + $isFont = 1; + } + + if ($isFont) { + $extraAttrs{$pkg} = " configureFlags = \"--with-fontrootdir=\$(out)/lib/X11/fonts\"; "; + } + sub process { my $requires = shift; my $s = shift; diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list index b6faca080689e..9e6b988ea595e 100644 --- a/pkgs/servers/x11/xorg/old.list +++ b/pkgs/servers/x11/xorg/old.list @@ -1,12 +1,13 @@ -mirror://xorg/individual/util/imake-1.0.2.tar.bz2 -mirror://xorg/individual/util/lndir-1.0.1.tar.bz2 -mirror://xorg/individual/util/xorg-cf-files-1.0.2.tar.bz2 -mirror://xorg/individual/app/bdftopcf-1.0.1.tar.bz2 -mirror://xorg/individual/proto/printproto-1.0.4.tar.bz2 +mirror://xorg/individual/app/twm-1.0.4.tar.bz2 +mirror://xorg/individual/app/xclock-1.0.4.tar.bz2 +mirror://xorg/individual/app/xeyes-1.0.991.tar.bz2 +mirror://xorg/individual/app/xfs-1.1.0.tar.bz2 +mirror://xorg/individual/app/xmessage-1.0.2.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/proto/xf86miscproto-0.9.3.tar.bz2 mirror://xorg/individual/util/gccmakedep-1.0.2.tar.bz2 -mirror://xorg/individual/app/xmessage-1.0.2.tar.bz2 -mirror://xorg/individual/app/xeyes-1.0.1.tar.bz2 -mirror://xorg/individual/app/xclock-1.0.3.tar.bz2 -mirror://xorg/individual/app/xfs-1.0.8.tar.bz2 -mirror://xorg/individual/app/twm-1.0.4.tar.bz2 +mirror://xorg/individual/util/imake-1.0.2.tar.bz2 +mirror://xorg/individual/util/lndir-1.0.1.tar.bz2 +mirror://xorg/individual/util/xorg-cf-files-1.0.3.tar.bz2 diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 099a9f699d0fe..6ca388c2d9002 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -19,6 +19,10 @@ preBuild = "substituteInPlace mkfontdir.cpp --replace BINDIR ${xorg.mkfontscale}/bin"; }; + libXext = attrs: attrs // { + buildInputs = attrs.buildInputs ++ [xorg.libXau]; + }; + libXpm = attrs: attrs // { patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in"; }; @@ -52,6 +56,10 @@ buildInputs = attrs.buildInputs ++ [xorg.kbproto xorg.libxkbfile xorg.randrproto]; }; + xf86inputsynaptics = attrs: attrs // { + makeFlags = "sdkdir=\${out}/include/xorg"; + }; + xf86videointel = attrs: attrs // { buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa]; }; @@ -82,8 +90,14 @@ xorgserver = attrs: attrs // { patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch]; - buildInputs = attrs.buildInputs ++ [args.zlib xorg.xf86bigfontproto]; - propagatedBuildInputs = [xorg.libpciaccess]; + buildInputs = attrs.buildInputs ++ + [ args.zlib xorg.xf86bigfontproto xorg.glproto args.mesa xorg.xf86driproto + xorg.compositeproto xorg.scrnsaverproto xorg.resourceproto + xorg.xineramaproto xorg.dri2proto xorg.xf86dgaproto xorg.dmxproto + xorg.libdmx xorg.xf86vidmodeproto + ]; + propagatedBuildInputs = + [ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto ]; postInstall = '' rm -rf $out/share/X11/xkb/compiled diff --git a/pkgs/servers/x11/xorg/tarballs-7.4.list b/pkgs/servers/x11/xorg/tarballs-7.4.list deleted file mode 100644 index f7a61b35095d2..0000000000000 --- a/pkgs/servers/x11/xorg/tarballs-7.4.list +++ /dev/null @@ -1,208 +0,0 @@ -mirror://xorg/X11R7.4/src/everything/applewmproto-1.0.3.tar.bz2 -mirror://xorg/X11R7.4/src/everything/appres-1.0.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/bigreqsproto-1.0.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/bitmap-1.0.3.tar.bz2 -mirror://xorg/X11R7.4/src/everything/compositeproto-0.4.tar.bz2 -mirror://xorg/X11R7.4/src/everything/damageproto-1.1.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/dmxproto-2.2.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/encodings-1.0.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/evieext-1.0.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/fixesproto-4.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-adobe-100dpi-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-adobe-75dpi-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-adobe-utopia-100dpi-1.0.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-adobe-utopia-75dpi-1.0.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-adobe-utopia-type1-1.0.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-alias-1.0.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-arabic-misc-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-bh-100dpi-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-bh-75dpi-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-bh-ttf-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-bh-type1-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-bitstream-100dpi-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-bitstream-75dpi-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-bitstream-speedo-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-bitstream-type1-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/fontcacheproto-0.1.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-cronyx-cyrillic-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-cursor-misc-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-daewoo-misc-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-dec-misc-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-ibm-type1-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-isas-misc-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-jis-misc-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-micro-misc-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-misc-cyrillic-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-misc-ethiopic-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-misc-meltho-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-misc-misc-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-mutt-misc-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-schumacher-misc-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-screen-cyrillic-1.0.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-sony-misc-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/fontsproto-2.0.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-sun-misc-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-util-1.0.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-winitzki-cyrillic-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/font-xfree86-type1-1.0.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/glproto-1.4.9.tar.bz2 -mirror://xorg/X11R7.4/src/everything/iceauth-1.0.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/inputproto-1.4.4.tar.bz2 -mirror://xorg/X11R7.4/src/everything/kbproto-1.0.3.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libAppleWM-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libdmx-1.0.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libfontenc-1.0.4.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libFS-1.0.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libICE-1.0.4.tar.bz2 -mirror://xorg/individual/lib/libpciaccess-0.10.5.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libSM-1.1.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libWindowsWM-1.0.0.tar.bz2 -mirror://xorg/individual/lib/libX11-1.2.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libXau-1.0.4.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libXaw-1.0.4.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libXcomposite-0.4.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libXcursor-1.1.9.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libXdamage-1.1.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libXdmcp-1.0.2.tar.bz2 -mirror://xorg/individual/lib/libXext-1.0.5.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libXfixes-4.0.3.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libXfont-1.3.3.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libXfontcache-1.0.4.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libXft-2.1.13.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libXi-1.1.3.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libXinerama-1.0.3.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libxkbfile-1.0.5.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libXmu-1.0.4.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libXpm-3.5.7.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libXrandr-1.2.3.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libXrender-0.9.4.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libXres-1.0.3.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libXScrnSaver-1.1.3.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libXt-1.0.5.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libXtst-1.0.3.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libXv-1.0.4.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libXvMC-1.0.4.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libXxf86dga-1.0.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libXxf86misc-1.0.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/libXxf86vm-1.0.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/luit-1.0.3.tar.bz2 -mirror://xorg/X11R7.4/src/everything/makedepend-1.0.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/mkfontdir-1.0.4.tar.bz2 -mirror://xorg/X11R7.4/src/everything/mkfontscale-1.0.5.tar.bz2 -mirror://xorg/X11R7.4/src/everything/randrproto-1.2.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/recordproto-1.13.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/renderproto-0.9.3.tar.bz2 -mirror://xorg/X11R7.4/src/everything/resourceproto-1.0.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/scrnsaverproto-1.1.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/sessreg-1.0.4.tar.bz2 -mirror://xorg/X11R7.4/src/everything/setxkbmap-1.0.4.tar.bz2 -mirror://xorg/X11R7.4/src/everything/smproxy-1.0.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/trapproto-3.4.3.tar.bz2 -mirror://xorg/X11R7.4/src/everything/util-macros-1.1.6.tar.bz2 -mirror://xorg/X11R7.4/src/everything/videoproto-2.2.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/windowswmproto-1.0.3.tar.bz2 -mirror://xorg/X11R7.4/src/everything/x11perf-1.5.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xauth-1.0.3.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xbacklight-1.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xbitmaps-1.0.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xcmiscproto-1.1.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xcmsdb-1.0.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xcursorgen-1.0.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xcursor-themes-1.0.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xdpyinfo-1.0.3.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xdriinfo-1.0.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xev-1.0.3.tar.bz2 -mirror://xorg/individual/proto/xextproto-7.0.5.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86bigfontproto-1.1.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86dga-1.0.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86dgaproto-2.0.3.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86driproto-2.0.4.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-input-acecad-1.2.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-input-aiptek-1.1.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-evdev-2.2.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-input-joystick-1.3.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-input-keyboard-1.3.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-input-mouse-1.3.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-input-synaptics-0.15.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-input-vmmouse-12.5.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-input-void-1.1.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86miscproto-0.9.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-apm-1.2.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-ark-0.7.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-ast-0.85.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-6.12.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-chips-1.2.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-cirrus-1.2.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-dummy-0.3.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-fbdev-0.4.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-geode-2.10.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-glide-1.0.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-glint-1.2.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-i128-1.3.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-i740-1.2.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-impact-0.2.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-intel-2.7.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-mach64-6.8.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-mga-1.4.9.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-neomagic-1.2.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-newport-0.2.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-nv-2.1.12.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-openchrome-0.2.903.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-r128-6.8.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-rendition-4.2.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-s3-0.6.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-s3virge-1.10.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-savage-2.2.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-siliconmotion-1.6.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-sis-0.10.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-sisusb-0.9.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-sunbw2-1.1.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-suncg14-1.1.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-suncg3-1.1.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-suncg6-1.1.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-sunffb-1.2.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-sunleo-1.2.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-suntcx-1.1.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-tdfx-1.4.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-tga-1.2.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-trident-1.3.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-tseng-1.2.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-v4l-0.2.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-vermilion-1.0.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-vesa-2.2.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-vmware-10.16.5.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-voodoo-1.2.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-wsfb-0.2.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-xgi-1.5.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86-video-xgixp-1.7.99.3.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xf86vidmodeproto-2.2.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xgamma-1.0.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xhost-1.0.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xineramaproto-1.1.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xinput-1.3.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xkbcomp-1.0.5.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xkbevd-1.0.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xkbutils-1.0.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xkill-1.0.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xlsatoms-1.0.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xlsclients-1.0.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xmodmap-1.0.3.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xorg-docs-1.4.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.5.3.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xorg-sgml-doctools-1.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xpr-1.0.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xprop-1.0.4.tar.bz2 -mirror://xorg/individual/proto/xproto-7.0.15.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xrandr-1.2.3.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xrdb-1.0.5.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xrefresh-1.0.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xset-1.0.4.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xsetmode-1.0.0.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xsetroot-1.0.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xtrans-1.2.1.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xvinfo-1.0.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xwd-1.0.2.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xwininfo-1.0.4.tar.bz2 -mirror://xorg/X11R7.4/src/everything/xwud-1.0.1.tar.bz2 diff --git a/pkgs/servers/x11/xorg/tarballs-7.5.list b/pkgs/servers/x11/xorg/tarballs-7.5.list new file mode 100644 index 0000000000000..f8c8f544bd841 --- /dev/null +++ b/pkgs/servers/x11/xorg/tarballs-7.5.list @@ -0,0 +1,196 @@ +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/X11R7.5/src/everything/dri2proto-2.1.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/X11R7.5/src/everything/font-adobe-100dpi-1.0.1.tar.bz2 +mirror://xorg/X11R7.5/src/everything/font-adobe-75dpi-1.0.1.tar.bz2 +mirror://xorg/X11R7.5/src/everything/font-adobe-utopia-100dpi-1.0.2.tar.bz2 +mirror://xorg/X11R7.5/src/everything/font-adobe-utopia-75dpi-1.0.2.tar.bz2 +mirror://xorg/X11R7.5/src/everything/font-adobe-utopia-type1-1.0.2.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/X11R7.5/src/everything/glproto-1.4.10.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/X11R7.5/src/everything/libpciaccess-0.10.9.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/X11R7.5/src/everything/libX11-1.3.2.tar.bz2 +mirror://xorg/X11R7.5/src/everything/libXau-1.0.5.tar.bz2 +mirror://xorg/X11R7.5/src/everything/libXaw-1.0.7.tar.bz2 +mirror://xorg/X11R7.5/src/everything/libXcomposite-0.4.1.tar.bz2 +mirror://xorg/X11R7.5/src/everything/libXcursor-1.1.10.tar.bz2 +mirror://xorg/X11R7.5/src/everything/libXdamage-1.1.2.tar.bz2 +mirror://xorg/X11R7.5/src/everything/libXdmcp-1.0.3.tar.bz2 +mirror://xorg/X11R7.5/src/everything/libXext-1.1.1.tar.bz2 +mirror://xorg/X11R7.5/src/everything/libXfixes-4.0.4.tar.bz2 +mirror://xorg/X11R7.5/src/everything/libXfont-1.4.1.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/X11R7.5/src/everything/libXrender-0.9.5.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/X11R7.5/src/everything/libXt-1.0.7.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/X11R7.5/src/everything/util-macros-1.3.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/X11R7.5/src/everything/xf86-input-evdev-2.3.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/X11R7.5/src/everything/xf86-input-synaptics-1.2.0.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/X11R7.5/src/everything/xf86-video-intel-2.9.1.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/X11R7.5/src/everything/xf86-video-vesa-2.2.1.tar.bz2 +mirror://xorg/X11R7.5/src/everything/xf86-video-vmware-10.16.8.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/X11R7.5/src/everything/xinput-1.5.0.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/X11R7.5/src/everything/xlsatoms-1.0.2.tar.bz2 +mirror://xorg/X11R7.5/src/everything/xlsclients-1.0.2.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/X11R7.5/src/everything/xorg-server-1.7.1.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/X11R7.5/src/everything/xproto-7.0.16.tar.bz2 +mirror://xorg/X11R7.5/src/everything/xrandr-1.3.2.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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08d28955b0baa..5fbc4794c979f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -187,14 +187,15 @@ let in import (dir + "/${pVersion}.nix") (args // { version = pVersion; }); - # usage: (you can use override multiple times) - # let d = makeOverridable stdenv.mkDerivation { name = ..; buildInputs; } - # noBuildInputs = d.override { buildInputs = []; } - # additionalBuildInputs = d.override ( args : args // { buildInputs = args.buildInputs ++ [ additional ]; } ) deepOverride = newArgs: name: x: if builtins.isAttrs x then ( if x ? deepOverride then (x.deepOverride newArgs) else if x ? override then (x.override newArgs) else x) else x; + + # usage: (you can use override multiple times) + # let d = makeOverridable stdenv.mkDerivation { name = ..; buildInputs; } + # noBuildInputs = d.override { buildInputs = []; } + # additionalBuildInputs = d.override ( args : args // { buildInputs = args.buildInputs ++ [ additional ]; } ) makeOverridable = f: origArgs: f origArgs // { override = newArgs: makeOverridable f (origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs)); @@ -3235,13 +3236,6 @@ let useX11 = true; # !!! `false' doesn't build }; - # !!! temporary fork; will replace dbus soon. - dbus_temp = import ../development/libraries/dbus/temp.nix { - inherit fetchurl stdenv pkgconfig expat; - inherit (xlibs) libX11 libICE libSM; - useX11 = true; # !!! `false' doesn't build - }; - dbus_glib = makeOverridable (import ../development/libraries/dbus-glib) { inherit fetchurl stdenv pkgconfig gettext dbus expat glib; }; @@ -3528,8 +3522,8 @@ let inherit (xorg) libX11 libXv libXext; inherit (gtkLibs) glib pango gtk; inherit (gnome) gnomevfs /* <- only passed for the no longer used older versions - it is deprecated and didn't build on amd64 due to samba dependency */ gtkdoc; - libsoup = gnome26.libsoup; + it is deprecated and didn't build on amd64 due to samba dependency */ gtkdoc + libsoup; }); gnet = import ../development/libraries/gnet { @@ -3555,7 +3549,7 @@ let inherit (gnome) gtk; }; - gtkLibs = recurseIntoAttrs gtkLibs216; + gtkLibs = recurseIntoAttrs gtkLibs218; glib = gtkLibs.glib; @@ -3628,7 +3622,7 @@ let gtk = import ../development/libraries/gtk+/2.18.x.nix { inherit fetchurl stdenv pkgconfig perl jasper glib atk pango - libtiff libjpeg libpng cairo xlibs cups openssl; + libtiff libjpeg libpng cairo xlibs cups; }; gtkmm = import ../development/libraries/gtkmm/2.18.x.nix { @@ -3829,7 +3823,8 @@ let }; libdrm = import ../development/libraries/libdrm { - inherit fetchurl stdenv pkgconfig pthread_stubs; + inherit fetchurl stdenv pkgconfig; + inherit (xorg) libpthreadstubs; }; libdvdcss = import ../development/libraries/libdvdcss { @@ -4140,12 +4135,6 @@ let pythonSupport = false; }; - # !!! Merge later. - libxml2New = makeOverridable (import ../development/libraries/libxml2/2.7.4.nix) { - inherit fetchurl stdenv zlib python; - pythonSupport = false; - }; - libxml2Python = libxml2.override { pythonSupport = true; }; @@ -4370,14 +4359,10 @@ let inherit fetchurl stdenv; }; - pthread_stubs = import ../development/libraries/pthread-stubs { - inherit fetchurl stdenv; - }; - qt3 = makeOverridable (import ../development/libraries/qt-3) { inherit fetchurl stdenv x11 zlib libjpeg libpng which mysql mesa; inherit (xlibs) xextproto libXft libXrender libXrandr randrproto - libXmu libXinerama xineramaproto libXcursor; + libXmu libXinerama libXcursor; openglSupport = mesaSupported; mysqlSupport = getConfig ["qt" "mysql"] false; }; @@ -4575,17 +4560,9 @@ let inherit fetchurl stdenv cmake unzip libtiff expat zlib libpng libjpeg; }; - webkit = builderDefsPackage (import ../development/libraries/webkit) - (lib.mapAttrs (deepOverride - { - # It needs fresh GTK - inherit (gnome28) gtkdoc libsoup GConf; - inherit (gtkLibs218) gtk atk pango glib; - gconf = gnome28.GConf; - }) - { + webkit = builderDefsPackage (import ../development/libraries/webkit) { inherit (gnome28) gtkdoc libsoup; - inherit (gtkLibs218) gtk atk pango glib; + inherit (gtkLibs) gtk atk pango glib; inherit freetype fontconfig gettext gperf curl libjpeg libtiff libpng libxml2 libxslt sqlite icu cairo perl intltool automake libtool @@ -4594,7 +4571,7 @@ let gstPluginsGood; flex = flex2535; inherit (xlibs) libXt; - }); + }; wxGTK = wxGTK26; @@ -6750,7 +6727,7 @@ let pkgconfig poppler libspectre djvulibre libxslt dbus dbus_glib shared_mime_info which makeWrapper; inherit (gnome) gnomedocutils gnomeicontheme libgnome - libgnomeui libglade glib gtk scrollkeeper; + libgnomeui libglade glib gtk scrollkeeper gnome_keyring; }; exrdisplay = import ../applications/graphics/exrdisplay { @@ -6886,8 +6863,9 @@ let inherit fetchurl stdenv pkgconfig freetype fontconfig libtiff libjpeg libpng libexif zlib perl perlXMLParser python pygtk gettext xlibs intltool babl gegl; - inherit (gnome) gtk libgtkhtml libart_lgpl; + inherit (gnome) gtk libart_lgpl; }; + gimpPlugins = import ../applications/graphics/gimp/plugins { inherit pkgs gimp; }; gitAndTools = recurseIntoAttrs (import ../applications/version-management/git-and-tools { @@ -7233,7 +7211,7 @@ let midori = builderDefsPackage (import ../applications/networking/browsers/midori) { inherit imagemagick intltool python pkgconfig webkit libxml2 which gettext makeWrapper file libidn sqlite docutils libnotify; - inherit (gtkLibs218) gtk glib; + inherit (gtkLibs) gtk glib; inherit (gnome28) gtksourceview libsoup; }; @@ -7355,7 +7333,7 @@ let inherit (xlibs) libXaw libXext libX11 libXtst libXi libXinerama; inherit (gtkLibs) gtk; inherit (perlPackages) ArchiveZip CompressZlib; - inherit (gnome26) GConf ORBit2; + inherit (gnome) GConf ORBit2; }; opera = import ../applications/networking/browsers/opera { @@ -7680,14 +7658,14 @@ let uzbl = builderDefsPackage (import ../applications/networking/browsers/uzbl) { inherit pkgconfig webkit makeWrapper; - inherit (gtkLibs218) gtk glib; + inherit (gtkLibs) gtk glib; libsoup = gnome28.libsoup; }; uzblExperimental = builderDefsPackage (import ../applications/networking/browsers/uzbl/experimental.nix) { inherit pkgconfig webkit makeWrapper; - inherit (gtkLibs218) gtk glib; + inherit (gtkLibs) gtk glib; libsoup = gnome28.libsoup; }; @@ -8152,33 +8130,9 @@ let inherit stdenv fetchurl pkgconfig x11 xlibs dbus imlib2 freetype; }; - gnome = recurseIntoAttrs (import ../desktops/gnome { - inherit - fetchurl stdenv pkgconfig - flex bison popt zlib libxml2 libxslt - perl perlXMLParser docbook_xml_dtd_42 docbook_xml_dtd_412 - docbook_xml_dtd_43 - gettext x11 libtiff libjpeg libpng gtkLibs xlibs bzip2 - libcm python dbus dbus_glib ncurses which libxml2Python - iconnamingutils openssl hal samba fam libgcrypt libtasn1 - xmlto docbook2x docbook_xsl intltool enchant isocodes polkit - libproxy sqlite; - }); - - gnome26 = import ../desktops/gnome-2.26 pkgs; + gnome28 = import ../desktops/gnome-2.28 pkgs; - gnome28 = import ../desktops/gnome-2.28 (pkgs// { - gtkLibs = gtkLibs218; - dbus_glib = dbus_glib.override { - inherit (gtkLibs218) glib; - }; - policykit = policykit.deepOverride { - inherit (gtkLibs218) glib; - }; - hal = hal.deepOverride { - inherit (gtkLibs218) glib; - }; - }); + gnome = gnome28; kde3 = { @@ -8201,12 +8155,6 @@ let kde4 = kde43; - kde42 = import ../desktops/kde-4.2 (pkgs // { - openexr = openexr_1_6_1; - qt4 = qt44; - popplerQt4 = popplerQt44; - }); - kde43 = import ../desktops/kde-4.3 (pkgs // { openexr = openexr_1_6_1; qt4 = qt45; @@ -8344,7 +8292,7 @@ let }; cups = import ../misc/cups { - inherit fetchurl stdenv zlib libjpeg libpng libtiff pam openssl; + inherit fetchurl stdenv pkgconfig zlib libjpeg libpng libtiff pam openssl dbus; }; gutenprint = import ../misc/drivers/gutenprint { @@ -8482,12 +8430,11 @@ let nixCustomFun = src: preConfigure: enableScripts: configureFlags: import ../tools/package-management/nix/custom.nix { inherit fetchurl stdenv perl curl bzip2 openssl src preConfigure automake - autoconf libtool configureFlags enableScripts lib bison; + autoconf libtool configureFlags enableScripts lib bison libxml2; flex = flex2533; aterm = aterm242fixes; db4 = db45; inherit docbook5_xsl libxslt docbook5 docbook_xml_dtd_43 w3m; - libxml2 = libxml2New; }; disnix = import ../tools/package-management/disnix { @@ -8535,7 +8482,7 @@ let { inherit stdenv fetchurl zlib aspell sox openssl qt4; inherit (xlibs) xproto libX11 libSM libICE; - qca2 = kde42.qca2; + qca2 = kde4.qca2; }; putty = import ../applications/networking/remote/putty { diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index ad5e85c357562..00360009387ec 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -236,7 +236,6 @@ in { libtool_2 = all; libtopology = all; libxml2 = all; - libxml2New = all; libxslt = all; linuxwacom = linux; lout = linux; @@ -440,11 +439,9 @@ in { }; gnome = { - gconfeditor = linux; - gnomepanel = linux; - gnometerminal = linux; - gnomeutils = linux; + gnome_panel = linux; metacity = linux; + gnome_vfs = linux; }; gtkLibs = { @@ -478,30 +475,6 @@ in { kdelibs = linux; }; - kde42 = { - amarok = linux; - kdeadmin = linux; - kdeartwork = linux; - kdebase = linux; - kdebase_runtime = linux; - kdebase_workspace = linux; - kdeedu = linux; - kdegames = linux; - kdegraphics = linux; - kdelibs = linux; - kdemultimedia = linux; - kdenetwork = linux; - kdepim = linux; - kdeplasma_addons = linux; - kdesdk = linux; - kdetoys = linux; - kdeutils = linux; - kdewebdev = linux; - ktorrent = linux; - kdesvn = linux; - krusader = linux; - }; - kde43 = { kdelibs = linux; kdelibs_experimental = linux; |