ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge x-updates into master

Browse Source 
There's a major dbus bump (1.6 -> 1.8), and various minor fixes and updates.
This commit is contained in:
Vladimír Čunát 2014-02-22 11:27:10 +01:00
commit 351f704091
22 changed files with 162 additions and 399 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/data/misc/xkeyboard-config/default.nix
View File

@ -1,25 +0,0 @@
{ stdenv, fetchurl, perl, perlXMLParser, xkbcomp, gettext, intltool }:
stdenv.mkDerivation rec {
name = "xkeyboard-config-2.7";
src = fetchurl {
url = "mirror://xorg/individual/data/xkeyboard-config/${name}.tar.bz2";
sha256 = "08c3mjdgp7c2v6lj5bymaczcazklsd7s1lxslxbngzmh5yhphd74";
};
buildInputs = [ gettext ];
nativeBuildInputs = [ perl perlXMLParser intltool xkbcomp ];
patches = [ ./eo.patch ];
preConfigure = ''
configureFlags="--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86 --disable-runtime-deps"
sed -e 's@#!\s*/bin/bash@#! /bin/sh@' -i rules/merge.sh
'';
postInstall = ''
cat ${./level3-deadkeys-us-intl} >> $out/etc/X11/xkb/symbols/us
'';
}

71
pkgs/data/misc/xkeyboard-config/eo.patch
View File

@ -1,71 +0,0 @@
diff --git a/rules/base.xml.in b/rules/base.xml.in
index ec321f8..e9c3546 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -1786,6 +1786,13 @@
</layout>
<layout>
<configItem>
+ <name>eo</name>
+ <_shortDescription>Esp</_shortDescription>
+ <_description>Esperanto</_description>
+ </configItem>
+ </layout>
+ <layout>
+ <configItem>
<name>ir</name>
<_shortDescription>Irn</_shortDescription>
<_description>Iran</_description>
diff --git a/symbols/Makefile.am b/symbols/Makefile.am
index 97c816d..d7e3a4e 100644
--- a/symbols/Makefile.am
+++ b/symbols/Makefile.am
@@ -10,7 +10,7 @@ bt by braille \
ca cd \
ch cn cz \
de dk \
-ee es et epo \
+ee eo es et epo \
fi fo fr \
gb ge gh gn \
gr hr hu \
diff --git a/symbols/Makefile.in b/symbols/Makefile.in
index b5be077..5cddcc7 100644
--- a/symbols/Makefile.in
+++ b/symbols/Makefile.in
@@ -222,7 +222,7 @@ bt by braille \
ca cd \
ch cn cz \
de dk \
-ee es et epo \
+ee eo es et epo \
fi fo fr \
gb ge gh gn \
gr hr hu \
diff --git a/symbols/eo b/symbols/eo
new file mode 100644
index 0000000..d6358c9
--- /dev/null
+++ b/symbols/eo
@@ -0,0 +1,21 @@
+// $XFree86$
+
+partial alphanumeric_keys
+xkb_symbols "basic" {
+
+ // Describes the differences between a very simple en_US
+ // keyboard and a simple Esperanto keyboard
+ // Press AltGr or Windows Menu key together with C, H, J, S, U
+ // to get accented letters.
+ // 2001 by Radovan Garabik <garabik@melkor.dnp.fmph.uniba.sk>
+
+ key.type = "FOUR_LEVEL";
+
+ key <AD02> { [w,W, ubreve,Ubreve ] };
+ key <AD07> { [u,U, ubreve, Ubreve ] };
+ key <AC02> { [s,S, scircumflex, Scircumflex ] };
+ key <AC05> { [g,G, gcircumflex,Gcircumflex ] };
+ key <AC06> { [h,H, hcircumflex,Hcircumflex ] };
+ key <AC07> { [j,J, jcircumflex,Jcircumflex ] };
+ key <AB03> { [c,C, ccircumflex,Ccircumflex ] };
+};

95
pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl
View File

@ -1,95 +0,0 @@
// Grabbed from http://lists.freedesktop.org/archives/xorg/2007-July/026686.html
// Submitted there by Adriaan van Nijendaal, he says he submitted it to X.org
// for inclusion, so it should be OK to use it as if it were part of X.org
// The keyboard section in the X-server config file
// (/etc/X11/xorg.conf on my system) looks like this:
//
// Section "InputDevice"
// Driver "kbd"
// Identifier "Keyboard[0]"
// Option "XkbModel" "pc101"
// Option "XkbLayout" "us"
// Option "XkbVariant" "altgr-intl"
// EndSection
//
// To be effective, you need to install this file, change the X config
// file and restart the X-server. Or, alternatively, you can do this
// run-time:
//
// setxkbmap -v -rules xorg -model pc101 -layout us -variant altgr-intl
//
// Once the X-server has loaded the new config, a keyboard can be
// displayed with: (if you change "-ll 1" into "-ll 2", you'll see
// the special keys ONLY.)
//
// xkbcomp -o /tmp/keyboard.xkm -opt cgkst -xkb $DISPLAY
// xkbprint -o /tmp/keyboard.xkm.ps -kc -nkg 2 -ntg 4 -lg 1 -ll 1 \
// -lc en_US.iso885915 -level2 -mono -label symbols -w 3 $DISPLAY;
// gv -seascape /tmp/keyboard.xkm.ps
// rm -f /tmp/keyboard.xkm.ps /tmp/keyboard.xkm
//
partial hidden alphanumeric_keys
xkb_symbols "altgr-intl-rich" {
name[Group1]= "U.S. English - International (AltGr dead keys)";
include "us(basic)"
key <TLDE> { [ grave, asciitilde, dead_grave, dead_tilde ] };
key <AE01> { [ 1, exclam, onesuperior, exclamdown ] };
key <AE02> { [ 2, at, twosuperior, dead_doubleacute] };
key <AE03> { [ 3, numbersign, threesuperior, dead_macron ] };
key <AE04> { [ 4, dollar, currency, sterling ] };
key <AE05> { [ 5, percent, EuroSign, approxeq ] };
key <AE06> { [ 6, asciicircum, dead_circumflex, dead_stroke ] };
key <AE07> { [ 7, ampersand, dead_horn ] };
key <AE08> { [ 8, asterisk, dead_ogonek, infinity ] };
key <AE09> { [ 9, parenleft, leftsinglequotemark,dead_breve ] };
key <AE10> { [ 0, parenright,rightsinglequotemark,dead_abovering ] };
key <AE11> { [ minus, underscore, yen, dead_belowdot ] };
key <AE12> { [ equal, plus, multiply, division ] };
key <AD01> { [ q, Q, adiaeresis, Adiaeresis ] };
key <AD02> { [ w, W, aring, Aring ] };
key <AD03> { [ e, E, eacute, Eacute ] };
key <AD04> { [ r, R, ediaeresis, Ediaeresis ] };
key <AD05> { [ t, T, thorn, THORN ] };
key <AD06> { [ y, Y, udiaeresis, Udiaeresis ] };
key <AD07> { [ u, U, uacute, Uacute ] };
key <AD08> { [ i, I, iacute, Iacute ] };
key <AD09> { [ o, O, oacute, Oacute ] };
key <AD10> { [ p, P, odiaeresis, Odiaeresis ] };
key <AD11> { [ bracketleft, braceleft, guillemotleft, lessthanequal ] };
key <AD12> { [ bracketright,braceright, guillemotright, greaterthanequal] };
key <AC01> { [ a, A, aacute, Aacute ] };
key <AC02> { [ s, S, ssharp, section ] };
key <AC03> { [ d, D, eth, ETH ] };
key <AC04> { [ f, F, union, intersection ] };
key <AC05> { [ g, G, eng, ENG ] };
key <AC06> { [ h, H, hyphen, nobreakspace ] };
key <AC07> { [ j, J, idiaeresis, Idiaeresis ] };
key <AC08> { [ k, K ] };
key <AC09> { [ l, L, oslash, Ooblique ] };
key <AC10> { [semicolon, colon, paragraph, degree ] };
key <AC11> { [apostrophe, quotedbl, dead_acute, dead_diaeresis ] };
key <AB01> { [ z, Z, ae, AE ] };
key <AB02> { [ x, X, oe, OE ] };
key <AB03> { [ c, C, copyright, cent ] };
key <AB04> { [ v, V, registered, trademark ] };
key <AB05> { [ b, B, emdash, endash ] };
key <AB06> { [ n, N, nu, numerosign ] };
key <AB07> { [ m, M, mu, plusminus ] };
key <AB08> { [ comma, less, ccedilla, Ccedilla ] };
key <AB09> { [ period, greater, dead_abovedot, dead_caron ] };
key <AB10> { [ slash, question, questiondown, dead_hook ] };
key <BKSL> { [backslash, bar, notsign, brokenbar ] };
// Let's have free choice
//include "level3(ralt_switch)"
};

4
pkgs/development/libraries/dbus/default.nix
View File

@ -3,8 +3,8 @@
, libX11, libICE, libSM, useX11 ? (stdenv.isLinux || stdenv.isDarwin) }:
let
version = "1.6.16"; # 1.7.* isn't recommended, even for gnome 3.8
sha256 = "0wrmh5azszb54zpy7d0zjsy456khcv8yc19ivqrygkdg7a3l4gs6";
version = "1.8.0";
sha256 = "04qbsyw92279hfkwic5h6jc5999p87qsaqqgc6zcqddmh9r8r7vn";
inherit (stdenv) lib;

10
pkgs/development/libraries/fontconfig/default.nix
View File

@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
}
else null;
buildInputs = [ pkgconfig freetype expat ];
propagatedBuildInputs = [ freetype ];
buildInputs = [ pkgconfig expat ];
configureFlags = "--sysconfdir=/etc --with-cache-dir=/var/cache/fontconfig --disable-docs --with-default-fonts=";
@ -38,10 +39,11 @@ stdenv.mkDerivation rec {
cd "$out/etc/fonts" && tar xvf ${infinality_patch}
'';
meta = {
meta = with stdenv.lib; {
description = "A library for font customization and configuration";
homepage = http://fontconfig.org/;
license = "bsd";
platforms = stdenv.lib.platforms.all;
license = licenses.bsd2; # custom but very bsd-like
platforms = platforms.all;
maintainers = [ maintainers.vcunat ];
};
}

6
pkgs/development/libraries/gdk-pixbuf/default.nix
View File

@ -3,14 +3,14 @@
let
ver_maj = "2.30";
ver_min = "2";
ver_min = "4";
in
stdenv.mkDerivation rec {
name = "gdk-pixbuf-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz";
sha256 = "1gzczsv41h28is4rrxjfyj1qx8ifp23fq2ckh0k099m9fnhbzfna";
sha256 = "0ldhpdalbyi6q5k1dz498i9hqcsd51yxq0f91ck9p0h4v38blfx1";
};
# !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
+ stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes"
;
doCheck = false; # broken animation tester
doCheck = true;
postInstall = "rm -rf $out/share/gtk-doc";

38
pkgs/development/libraries/glib/default.nix
View File

@ -1,5 +1,9 @@
{ stdenv, fetchurl, pkgconfig, gettext, perl, python, autoconf, automake, libtool
, libiconvOrEmpty, libintlOrEmpty, zlib, libffi, pcre, libelf, dbus }:
{ stdenv, fetchurl, pkgconfig, gettext, perl, python
, libiconvOrEmpty, libintlOrEmpty, zlib, libffi, pcre, libelf
# this is just for tests (not in closure of any regular package)
, libxml2, tzdata, desktop_file_utils, shared_mime_info, doCheck ? false
}:
# TODO:
# * Add gio-module-fam
@ -17,7 +21,6 @@
https://wiki.gnome.org/GnomeGoals/InstalledTests
* Support org.freedesktop.Application, including D-Bus activation from desktop files
*/
let
# Some packages don't get "Cflags" from pkgconfig correctly
# and then fail to build when directly including like <glib/...>.
@ -35,7 +38,7 @@ let
ver_maj = "2.38";
ver_min = "2";
in
with { inherit (stdenv.lib) optional optionalString; };
with { inherit (stdenv.lib) optional optionals optionalString; };
stdenv.mkDerivation rec {
name = "glib-${ver_maj}.${ver_min}";
@ -45,28 +48,33 @@ stdenv.mkDerivation rec {
sha256 = "0d2px8m77603s5pm3md4bcm5d0ksbcsb6ik1w52hjslnq1a9hsh5";
};
# configure script looks for d-bus but it is (probably) only needed for tests
buildInputs = [ libelf ];
buildInputs = [ libelf ]
++ optionals doCheck [ tzdata libxml2 desktop_file_utils shared_mime_info ];
# I don't know why the autotools are needed now, even without modifying configure scripts
nativeBuildInputs = [ pkgconfig gettext perl python ] ++ [ autoconf automake libtool ];
nativeBuildInputs = [ pkgconfig gettext perl python ];
propagatedBuildInputs = [ pcre zlib libffi ] ++ libiconvOrEmpty ++ libintlOrEmpty;
preConfigure = "autoreconf -fi";
configureFlags =
optional stdenv.isDarwin "--disable-compile-warnings"
++ optional stdenv.isSunOS "--disable-modular-tests";
CPPFLAGS = optionalString stdenv.isSunOS "-DBSD_COMP";
NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-lintl";
NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"
+ optionalString stdenv.isSunOS " -DBSD_COMP";
enableParallelBuilding = true;
doCheck = false; # ToDo: fix the remaining problems, so we have checked glib by default
LD_LIBRARY_PATH = optionalString doCheck "${stdenv.gcc.gcc}/lib";
inherit doCheck;
preCheck = optionalString doCheck
# libgcc_s.so.1 must be installed for pthread_cancel to work
# also point to the glib/.libs path
'' export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.gcc.gcc}/lib*/libgcc_s.so)):$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH"
export TZDIR="${tzdata}/share/zoneinfo"
export XDG_CACHE_HOME="$TMP"
export XDG_RUNTIME_HOME="$TMP"
export HOME="$TMP"
export XDG_DATA_DIRS="${desktop_file_utils}/share:${shared_mime_info}/share"
'';
postInstall = ''rm -rvf $out/share/gtk-doc'';

9
pkgs/development/libraries/gtk+/3.x.nix
View File

@ -10,14 +10,15 @@ assert cupsSupport -> cups != null;
let
ver_maj = "3.10";
ver_min = "6";
ver_min = "7";
version = "${ver_maj}.${ver_min}";
in
stdenv.mkDerivation rec {
name = "gtk+-${ver_maj}.${ver_min}";
name = "gtk+3-${version}";
src = fetchurl {
url = "mirror://gnome/sources/gtk+/${ver_maj}/${name}.tar.xz";
sha256 = "12i6n2vijglqgc7z5migllhpygg65fqzfgrsknimwynbqmzwa91w";
url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
sha256 = "09wlsim4immrws0fyvpk03sspsljcsgybrwp73scycah70axxsdp";
};
enableParallelBuilding = true;

4
pkgs/development/libraries/harfbuzz/default.nix
View File

@ -8,11 +8,11 @@
# (icu is a ~30 MB dependency, the rest is very small in comparison)
stdenv.mkDerivation rec {
name = "harfbuzz-0.9.25";
name = "harfbuzz-0.9.26";
src = fetchurl {
url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2";
sha256 = "1vkbdny880d60j3v6lvpc6p8fvj6cl7hma27h796qlk9lnbmjvnw";
sha256 = "0mz220qv3xn3lk1v94q1wgykayxnas94n8ks1liwkdazs71pvvax";
};
configureFlags = [

4
pkgs/development/libraries/libdrm/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }:
stdenv.mkDerivation rec {
name = "libdrm-2.4.50";
name = "libdrm-2.4.52";
src = fetchurl {
url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
sha256 = "0idh6cwqr2rilig7vygb3gxvivchp0q1iq4md79jq340v96d48rq";
sha256 = "1h8q0azb5bxqljpi1dlxmh5i30c4wdrncffcpppzrgk13wpkqsgs";
};
nativeBuildInputs = [ pkgconfig ];

6
pkgs/development/libraries/libpng/default.nix
View File

@ -3,11 +3,11 @@
assert zlib != null;
let
version = "1.6.8";
sha256 = "109h2fcjspd792lvh5q4xnkpsv7rjczmrdl15i4ajx0xbs5kvxr4";
version = "1.6.9";
sha256 = "0ji7488fp08b3xa6605zzghzpxawkhhg6jbqzrdw2y38zrvadqzx";
patch_src = fetchurl {
url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz";
sha256 = "0wysnv0d8h7pyz7gfagnkwra2k7malqga1cn6wbk2l7a8k2r53qi";
sha256 = "0l61y6b03avyxrx8c72x8m73j3b8mj0wx80wdl6w82wgnr2fw4x1";
};
whenPatched = stdenv.lib.optionalString apngSupport;

28
pkgs/development/libraries/mesa/default.nix
View File

@ -1,9 +1,8 @@
{ stdenv, fetchurl, pkgconfig, intltool, flex, bison, autoconf, automake, libtool
{ stdenv, fetchurl, pkgconfig, intltool, flex, bison, autoreconfHook
, python, libxml2Python, file, expat, makedepend
, libdrm, xorg, wayland, udev, llvm, libffi
, libvdpau
, libvdpau, libelf
, enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt
, enableR600LlvmCompiler ? true, libelf
, enableExtraFeatures ? false # not maintained
}:
@ -13,19 +12,19 @@ else
/** Packaging design:
- The basic mesa ($out) contains headers and libraries (GLU is in mesa_glu now).
This or the mesa attribute (which also contains GLU) are small (~ 2.2 MB, mostly headers)
This or the mesa attribute (which also contains GLU) are small (~ 2 MB, mostly headers)
and are designed to be the buildInput of other packages.
- DRI and EGL drivers are compiled into $drivers output,
which is bigger (~13 MB) and depends on LLVM (~44 MB).
which is much bigger and depends on LLVM.
These should be searched at runtime in "/run/opengl-driver{,-32}/lib/*"
and so are kind-of impure (given by NixOS).
(I suppose on non-NixOS one would create the appropriate symlinks from there.)
- libOSMesa is in $osmesa (~4.2 MB)
- libOSMesa is in $osmesa (~4 MB)
*/
let
version = "9.2.5";
# this is the default search path for DRI drivers (note: X server introduces an overriding env var)
# this is the default search path for DRI drivers (note: X server no longer introduces an overriding env var)
driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
in
with { inherit (stdenv.lib) optional optionals optionalString; };
@ -54,8 +53,6 @@ stdenv.mkDerivation {
outputs = ["out" "drivers" "osmesa"];
preConfigure = "./autogen.sh";
configureFlags = [
"--with-dri-driverdir=$(drivers)/lib/dri"
"--with-egl-driver-dir=$(drivers)/lib/egl"
@ -72,11 +69,9 @@ stdenv.mkDerivation {
"--enable-osmesa" # used by wine
"--with-dri-drivers=i965,r200,radeon"
("--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast"
+ optionalString enableR600LlvmCompiler ",radeonsi")
"--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast,radeonsi"
"--with-egl-platforms=x11,wayland,drm" "--enable-gbm" "--enable-shared-glapi"
]
++ optional enableR600LlvmCompiler "--enable-r600-llvm-compiler"
++ optional enableTextureFloats "--enable-texture-float"
++ optionals enableExtraFeatures [
"--enable-openvg" "--enable-gallium-egl" # not needed for EGL in Gallium, but OpenVG might be useful
@ -90,17 +85,16 @@ stdenv.mkDerivation {
++ optionals stdenv.isLinux [libdrm]
;
buildInputs = with xorg; [
autoconf automake libtool intltool expat libxml2Python llvm
autoreconfHook intltool expat libxml2Python llvm
libXfixes glproto dri2proto libX11 libXext libxcb libXt
libffi wayland libvdpau
libffi wayland libvdpau libelf
] ++ optionals enableExtraFeatures [ /*libXvMC*/ ]
++ optional stdenv.isLinux udev
++ optional enableR600LlvmCompiler libelf
;
enableParallelBuilding = true;
#doCheck = true; # https://bugs.freedesktop.org/show_bug.cgi?id=67672
# TODO: best fix this before merging >=9.2 to master
#doCheck = true; # https://bugs.freedesktop.org/show_bug.cgi?id=67672,
# also, 10.* links bad due to some RTTI problem
# move gallium-related stuff to $drivers, so $out doesn't depend on LLVM;
# also move libOSMesa to $osmesa, as it's relatively big

3
pkgs/development/libraries/pango/default.nix
View File

@ -2,7 +2,7 @@
, libintlOrEmpty, gobjectIntrospection }:
stdenv.mkDerivation rec {
name = "pango-1.32.5"; #.6 and higher need a not-yet-stable fontconfig (!)
name = "pango-1.32.5"; #.6 and higher need fontconfig-2.11.* which is troublesome
src = fetchurl {
url = "mirror://gnome/sources/pango/1.32/${name}.tar.xz";
@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
doCheck = true;
postInstall = "rm -rf $out/share/gtk-doc";
meta = {

41
pkgs/development/tools/misc/automake/automake-1.10.x.nix
View File

@ -1,41 +0,0 @@
{stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false}:
stdenv.mkDerivation rec {
name = "automake-1.10.3";
builder = ./builder.sh;
setupHook = ./setup-hook.sh;
src = fetchurl {
url = "mirror://gnu/automake/${name}.tar.bz2";
sha256 = "1p0sgv8zl6ah6vwpqf7jkrjr3cw8ydpmnbi0ljb1dhrrp0xv92p9";
};
buildInputs = [perl autoconf makeWrapper];
inherit doCheck;
# Disable indented log output from Make, otherwise "make.test" will
# fail.
preCheck = "unset NIX_INDENT_MAKE";
# Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
# "fixed" path in generated files!
dontPatchShebangs = true;
meta = {
homepage = http://www.gnu.org/software/automake/;
description = "GNU standard-compliant makefile generator";
longDescription = ''
GNU Automake is a tool for automatically generating
`Makefile.in' files compliant with the GNU Coding
Standards. Automake requires the use of Autoconf.
'';
license = "GPLv2+";
maintainers = [ stdenv.lib.maintainers.ludo ];
};
}

35
pkgs/os-specific/linux/xf86-video-nouveau/default.nix
View File

@ -1,35 +0,0 @@
{ stdenv
, fetchurl
, autoconf
, automake
, libtool
, xorgserver, xproto, fontsproto, xf86driproto, renderproto, videoproto, pixman
, utilmacros
, libdrm
, pkgconfig }:
stdenv.mkDerivation rec {
name = "xf86-video-nouveau-1.0.7";
src = fetchurl {
url = "mirror://xorg/individual/driver/${name}.tar.bz2";
sha256 = "0cg1q9dz9ksfp593x707gr10s8p7z00zdws1r4lshg42w5ccd1yi";
};
buildInputs = [
xorgserver xproto fontsproto xf86driproto renderproto videoproto pixman
utilmacros
libdrm
pkgconfig
];
meta = {
homepage = http://nouveau.freedesktop.org/wiki/;
description = "The xorg driver for nouveau-driven video cards";
license = "gplv2";
};
}

100
pkgs/servers/x11/xorg/default.nix
View File

@ -890,11 +890,11 @@ let
})) // {inherit ;};
libxcb = (stdenv.mkDerivation ((if overrides ? libxcb then overrides.libxcb else x: x) {
name = "libxcb-1.9.1";
name = "libxcb-1.10";
builder = ./builder.sh;
src = fetchurl {
url = http://xcb.freedesktop.org/dist/libxcb-1.9.1.tar.bz2;
sha256 = "0brn7vw66widc5mw7gynwy8dln3gmzym2fqqyzk6k58bxgs5yjnl";
url = http://xcb.freedesktop.org/dist/libxcb-1.10.tar.bz2;
sha256 = "1dfmyb1zjx6n0zhr4y40mc1crlmj3bfjjhmn0f30ip9nnq2spncq";
};
buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ];
})) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;};
@ -1130,11 +1130,11 @@ let
})) // {inherit ;};
xcbproto = (stdenv.mkDerivation ((if overrides ? xcbproto then overrides.xcbproto else x: x) {
name = "xcb-proto-1.8";
name = "xcb-proto-1.10";
builder = ./builder.sh;
src = fetchurl {
url = http://xcb.freedesktop.org/dist/xcb-proto-1.8.tar.bz2;
sha256 = "1c11652h9sjynw3scm1pn5z3a6ci888pq7hij8q5n8qrl33icg93";
url = http://xcb.freedesktop.org/dist/xcb-proto-1.10.tar.bz2;
sha256 = "01dgp802i4ic9wkmpa7g1wm50pp547d3b96jjz2hnxavhpfhvx3y";
};
buildInputs = [pkgconfig python ];
})) // {inherit python ;};
@ -1180,11 +1180,11 @@ let
})) // {inherit gperf m4 libxcb xproto ;};
xcbutilwm = (stdenv.mkDerivation ((if overrides ? xcbutilwm then overrides.xcbutilwm else x: x) {
name = "xcb-util-wm-0.3.9";
name = "xcb-util-wm-0.4.0";
builder = ./builder.sh;
src = fetchurl {
url = http://xcb.freedesktop.org/dist/xcb-util-wm-0.3.9.tar.bz2;
sha256 = "0c30fj33gvwzwhyz1dhsfwni0ai16bxpvxb4l6c6s7vvj7drp3q3";
url = http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.0.tar.bz2;
sha256 = "07zmlaaqkasihmkfwcac4wclb8zws915inz57y3kr3frywc7ryb6";
};
buildInputs = [pkgconfig gperf m4 libxcb xproto ];
})) // {inherit gperf m4 libxcb xproto ;};
@ -1280,11 +1280,11 @@ let
})) // {inherit libX11 xproto libXrandr ;};
xextproto = (stdenv.mkDerivation ((if overrides ? xextproto then overrides.xextproto else x: x) {
name = "xextproto-7.2.1";
name = "xextproto-7.3.0";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/xextproto-7.2.1.tar.bz2;
sha256 = "06kdanbnprxvgl56l5h0lqj4b0f1fbb1ndha33mv5wvy802v2lvw";
url = mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2;
sha256 = "1c2vma9gqgc2v06rfxdiqgwhxmzk2cbmknwf1ng3m76vr0xb5x7k";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
@ -1330,11 +1330,11 @@ let
})) // {inherit ;};
xf86inputevdev = (stdenv.mkDerivation ((if overrides ? xf86inputevdev then overrides.xf86inputevdev else x: x) {
name = "xf86-input-evdev-2.7.3";
name = "xf86-input-evdev-2.8.2";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/driver/xf86-input-evdev-2.7.3.tar.bz2;
sha256 = "01557w1kmsaqdsc42pxyypig10l5r5vh9axz9g22hg9cc09r8f7b";
url = mirror://xorg/individual/driver/xf86-input-evdev-2.8.2.tar.bz2;
sha256 = "1cvyg425px92hr5ql1s7v0c7n9jyvg0aaajrf5vyxgc3k9s6213m";
};
buildInputs = [pkgconfig inputproto udev xorgserver xproto ];
})) // {inherit inputproto udev xorgserver xproto ;};
@ -1350,31 +1350,31 @@ let
})) // {inherit inputproto kbproto xorgserver xproto ;};
xf86inputkeyboard = (stdenv.mkDerivation ((if overrides ? xf86inputkeyboard then overrides.xf86inputkeyboard else x: x) {
name = "xf86-input-keyboard-1.6.1";
name = "xf86-input-keyboard-1.8.0";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/xf86-input-keyboard-1.6.1.tar.bz2;
sha256 = "1hwc1bjw5mxv186xbrxiky0agfglwqg8fsxqdh4br1vzgxpck7ma";
url = mirror://xorg/individual/driver/xf86-input-keyboard-1.8.0.tar.bz2;
sha256 = "0nyb61w30z32djrllgr2s1i13di3vsl6hg4pqjhxdal71971ria1";
};
buildInputs = [pkgconfig inputproto xorgserver xproto ];
})) // {inherit inputproto xorgserver xproto ;};
xf86inputmouse = (stdenv.mkDerivation ((if overrides ? xf86inputmouse then overrides.xf86inputmouse else x: x) {
name = "xf86-input-mouse-1.7.2";
name = "xf86-input-mouse-1.9.0";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/xf86-input-mouse-1.7.2.tar.bz2;
sha256 = "0fs1lwnycyv3d0m6l2wrnlgvbs8qw66d93hwlnmrsswfq5bp6ark";
url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.0.tar.bz2;
sha256 = "12344w0cxac1ld54qqwynxwazbmmpvqh1mzcskmfkmakmr5iwq2x";
};
buildInputs = [pkgconfig inputproto xorgserver xproto ];
})) // {inherit inputproto xorgserver xproto ;};
xf86inputsynaptics = (stdenv.mkDerivation ((if overrides ? xf86inputsynaptics then overrides.xf86inputsynaptics else x: x) {
name = "xf86-input-synaptics-1.7.1";
name = "xf86-input-synaptics-1.7.3";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/driver/xf86-input-synaptics-1.7.1.tar.bz2;
sha256 = "13mmpcwp1d69w6c458a4fdqgwl24bpvrnq3zd6833chz1rk2an6v";
url = mirror://xorg/individual/driver/xf86-input-synaptics-1.7.3.tar.bz2;
sha256 = "1m9j5shypv3dmxxfxjcmj01glay4gqqlchxqav89a4cn8ch9falb";
};
buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ];
})) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;};
@ -1470,21 +1470,21 @@ let
})) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;};
xf86videogeode = (stdenv.mkDerivation ((if overrides ? xf86videogeode then overrides.xf86videogeode else x: x) {
name = "xf86-video-geode-2.11.14";
name = "xf86-video-geode-2.11.15";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/driver/xf86-video-geode-2.11.14.tar.bz2;
sha256 = "1k6gl1kq2fr0gj6sqrg2rypp59f8b8pr46c902m4z4rjr530nxac";
url = mirror://xorg/individual/driver/xf86-video-geode-2.11.15.tar.bz2;
sha256 = "1w4ghr2a41kaw4g9na8ws5fjbmy8zkbxpxa21vmqc8mkjzb3pnq0";
};
buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
})) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
xf86videoglide = (stdenv.mkDerivation ((if overrides ? xf86videoglide then overrides.xf86videoglide else x: x) {
name = "xf86-video-glide-1.2.1";
name = "xf86-video-glide-1.2.2";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/driver/xf86-video-glide-1.2.1.tar.bz2;
sha256 = "0vp9izdy7lgx09jfwr4ra9zvrx1hg15a5v2nhx00v31ffkh2aiyp";
url = mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2;
sha256 = "1vaav6kx4n00q4fawgqnjmbdkppl0dir2dkrj4ad372mxrvl9c4y";
};
buildInputs = [pkgconfig xextproto xorgserver xproto ];
})) // {inherit xextproto xorgserver xproto ;};
@ -1530,11 +1530,11 @@ let
})) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
xf86videomga = (stdenv.mkDerivation ((if overrides ? xf86videomga then overrides.xf86videomga else x: x) {
name = "xf86-video-mga-1.6.2";
name = "xf86-video-mga-1.6.3";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/driver/xf86-video-mga-1.6.2.tar.bz2;
sha256 = "0v6agqc9lxg8jgrksc1yksmhnv70j1vnhm09i7gg14za1qjwx29z";
url = mirror://xorg/individual/driver/xf86-video-mga-1.6.3.tar.bz2;
sha256 = "1my7y67sadjjmab1dyxckylrggi7p01yk4wwg9w6k1q96pmb213p";
};
buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
})) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
@ -1559,6 +1559,16 @@ let
buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xorgserver xproto ];
})) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;};
xf86videonouveau = (stdenv.mkDerivation ((if overrides ? xf86videonouveau then overrides.xf86videonouveau else x: x) {
name = "xf86-video-nouveau-1.0.10";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.10.tar.bz2;
sha256 = "17fvjplzfx86099sqys0bfl8lfbmjz8li84kzj2x95mf1cbb7fn1";
};
buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
})) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
xf86videonv = (stdenv.mkDerivation ((if overrides ? xf86videonv then overrides.xf86videonv else x: x) {
name = "xf86-video-nv-2.1.20";
builder = ./builder.sh;
@ -1580,21 +1590,21 @@ let
})) // {inherit fontsproto glproto libdrm udev 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.9.1";
name = "xf86-video-r128-6.9.2";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/driver/xf86-video-r128-6.9.1.tar.bz2;
sha256 = "0k746kk75h3hg3wmihqlmp14s52fg0svylqay02km7misflbmqwb";
url = mirror://xorg/individual/driver/xf86-video-r128-6.9.2.tar.bz2;
sha256 = "1q3fsc603k2yinphx5rrcl5356qkpywwz8axlw277l2231gjjbcb";
};
buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ];
})) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;};
xf86videosavage = (stdenv.mkDerivation ((if overrides ? xf86videosavage then overrides.xf86videosavage else x: x) {
name = "xf86-video-savage-2.3.6";
name = "xf86-video-savage-2.3.7";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/driver/xf86-video-savage-2.3.6.tar.bz2;
sha256 = "1mk3mpwl97clxhwzl990hj31z8qfh7fd4vs6qbl5i250ykc3x0a8";
url = mirror://xorg/individual/driver/xf86-video-savage-2.3.7.tar.bz2;
sha256 = "0i2aqp68rfkrz9c1p6d7ny9x7bjrlnby7q56zf01fb12r42l4784";
};
buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
})) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
@ -1820,11 +1830,11 @@ let
})) // {inherit inputproto libX11 libXaw xproto libXt ;};
xkeyboardconfig = (stdenv.mkDerivation ((if overrides ? xkeyboardconfig then overrides.xkeyboardconfig else x: x) {
name = "xkeyboard-config-2.8";
name = "xkeyboard-config-2.11";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.8.tar.bz2;
sha256 = "1bkq415qw4r3dl139mqgal9v585x7kh3km6z1lraz2j8im3ga72f";
url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.11.tar.bz2;
sha256 = "0xkdyyi759hzls42hp4j3q2lc35n4j6b2g44ilx5qarci5h584p7";
};
buildInputs = [pkgconfig libX11 xproto ];
})) // {inherit libX11 xproto ;};
@ -2000,11 +2010,11 @@ let
})) // {inherit libX11 xbitmaps libXcursor libXmu ;};
xtrans = (stdenv.mkDerivation ((if overrides ? xtrans then overrides.xtrans else x: x) {
name = "xtrans-1.2.7";
name = "xtrans-1.3.3";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/xtrans-1.2.7.tar.bz2;
sha256 = "19p1bw3qyn0ia1znx6q3gx92rr9rl88ylrfijjclm8vhpa8i30bz";
url = mirror://xorg/individual/lib/xtrans-1.3.3.tar.bz2;
sha256 = "1gq9i9p1q7wgaj1vm1n5mrw0rp0bpcdk4hdy9yj82i92rsnv8bb2";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};

6
pkgs/servers/x11/xorg/extra.list
View File

@ -1,9 +1,9 @@
http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2
http://xcb.freedesktop.org/dist/libxcb-1.9.1.tar.bz2
http://xcb.freedesktop.org/dist/xcb-proto-1.8.tar.bz2
http://xcb.freedesktop.org/dist/libxcb-1.10.tar.bz2
http://xcb.freedesktop.org/dist/xcb-proto-1.10.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-0.3.9.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-image-0.3.9.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.3.9.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.8.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-wm-0.3.9.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.0.tar.bz2
http://xorg.freedesktop.org/releases/individual/util/util-macros-1.17.tar.bz2

19
pkgs/servers/x11/xorg/overrides.nix
View File

@ -131,7 +131,7 @@ in
postInstall =
''
mkdir -p $out/share
ln -sfn ${args.xkeyboard_config}/etc/X11 $out/share/X11
ln -sfn ${xorg.xkeyboardconfig}/etc/X11 $out/share/X11
'';
};
@ -148,6 +148,10 @@ in
installFlags = "sdkdir=\${out}/include/xorg";
};
xf86inputmouse = attrs: attrs // {
installFlags = "sdkdir=\${out}/include/xorg";
};
xf86inputjoystick = attrs: attrs // {
installFlags = "sdkdir=\${out}/include/xorg";
};
@ -174,6 +178,10 @@ in
xf86videovmware = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [ args.mesa_drivers ]; # for libxatracker
patches = [( args.fetchurl {
url = https://projects.archlinux.org/svntogit/packages.git/plain/trunk/xatracker-v2-fixes.patch?h=packages/xf86-video-vmware;
sha256 = "1k5a3zf2bzmw84di31b8zfy51n2mqrr01xjfy5nw7395qv5r5cvs";
})];
};
xdriinfo = attrs: attrs // {
@ -189,7 +197,16 @@ in
};
xkeyboardconfig = attrs: attrs // {
#TODO: resurrect patches for US_intl and Esperanto?
buildInputs = attrs.buildInputs ++ [args.intltool];
# 1: compatibility for X11/xkb location
# 2: I think pkgconfig/ is supposed to be in /lib/
postInstall = ''
ln -s share "$out/etc"
mkdir "$out/lib" && ln -s ../share/pkgconfig "$out/lib/"
'';
};
xmodmap = attrs: attrs // {

27
pkgs/servers/x11/xorg/tarballs-7.7.list
View File

@ -108,36 +108,37 @@ mirror://xorg/X11R7.7/src/everything/xcursor-themes-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/xdpyinfo-1.3.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xdriinfo-1.0.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/xev-1.2.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xextproto-7.2.1.tar.bz2
mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2
mirror://xorg/individual/driver/xf86-input-evdev-2.7.3.tar.bz2
mirror://xorg/individual/driver/xf86-input-evdev-2.8.2.tar.bz2
mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-input-keyboard-1.6.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-input-mouse-1.7.2.tar.bz2
mirror://xorg/individual/driver/xf86-input-synaptics-1.7.1.tar.bz2
mirror://xorg/individual/driver/xf86-input-keyboard-1.8.0.tar.bz2
mirror://xorg/individual/driver/xf86-input-mouse-1.9.0.tar.bz2
mirror://xorg/individual/driver/xf86-input-synaptics-1.7.3.tar.bz2
mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2
mirror://xorg/individual/driver/xf86-input-void-1.4.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-ast-0.98.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-ati-7.2.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-nouveau-1.0.10.tar.bz2
mirror://xorg/individual/driver/xf86-video-cirrus-1.5.2.tar.bz2
mirror://xorg/individual/driver/xf86-video-dummy-0.3.7.tar.bz2
mirror://xorg/individual/driver/xf86-video-fbdev-0.4.4.tar.bz2
mirror://xorg/individual/driver/xf86-video-geode-2.11.14.tar.bz2
mirror://xorg/individual/driver/xf86-video-glide-1.2.1.tar.bz2
mirror://xorg/individual/driver/xf86-video-geode-2.11.15.tar.bz2
mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2
mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2
mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2
mirror://xorg/individual/driver/xf86-video-intel-2.21.9.tar.bz2
mirror://xorg/individual/driver/xf86-video-intel-2.21.15.tar.bz2
mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2
mirror://xorg/individual/driver/xf86-video-mga-1.6.2.tar.bz2
mirror://xorg/individual/driver/xf86-video-mga-1.6.3.tar.bz2
mirror://xorg/individual/driver/xf86-video-neomagic-1.2.8.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2
mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2
mirror://xorg/individual/driver/xf86-video-openchrome-0.3.3.tar.bz2
mirror://xorg/individual/driver/xf86-video-r128-6.9.1.tar.bz2
mirror://xorg/individual/driver/xf86-video-savage-2.3.6.tar.bz2
mirror://xorg/individual/driver/xf86-video-r128-6.9.2.tar.bz2
mirror://xorg/individual/driver/xf86-video-savage-2.3.7.tar.bz2
mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.7.tar.bz2
mirror://xorg/individual/driver/xf86-video-sis-0.10.7.tar.bz2
mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2
@ -158,7 +159,7 @@ mirror://xorg/X11R7.7/src/everything/xinput-1.6.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xkbcomp-1.2.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/xkbevd-1.1.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/xkbutils-1.0.3.tar.bz2
mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.8.tar.bz2
mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.11.tar.bz2
mirror://xorg/X11R7.7/src/everything/xkill-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xlsclients-1.1.2.tar.bz2
@ -174,7 +175,7 @@ mirror://xorg/X11R7.7/src/everything/xrdb-1.0.9.tar.bz2
mirror://xorg/X11R7.7/src/everything/xrefresh-1.0.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/xset-1.2.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/xsetroot-1.1.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xtrans-1.2.7.tar.bz2
mirror://xorg/individual/lib/xtrans-1.3.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/xvinfo-1.1.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xwd-1.0.5.tar.bz2
mirror://xorg/X11R7.7/src/everything/xwininfo-1.1.2.tar.bz2

20
pkgs/top-level/all-packages.nix
View File

@ -3412,8 +3412,6 @@ let
automake = automake112x;
automake110x = callPackage ../development/tools/misc/automake/automake-1.10.x.nix { };
automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { };
automake112x = callPackage ../development/tools/misc/automake/automake-1.12.x.nix { };
@ -4400,8 +4398,8 @@ let
stdenv = if stdenv.isDarwin
then overrideGCC stdenv gccApple
else stdenv;
automake = automake113x;
};
glib-tested = glib.override { doCheck = true; }; # checked version separate to break cycles
glibmm = callPackage ../development/libraries/glibmm { };
glib_networking = callPackage ../development/libraries/glib-networking {};
@ -4428,9 +4426,9 @@ let
cupsSupport = config.gtk2.cups or stdenv.isLinux;
};
gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.x.nix {
gtk3 = callPackage ../development/libraries/gtk+/3.x.nix {
inherit (gnome3) at_spi2_atk;
});
};
gtk = pkgs.gtk2;
@ -6426,9 +6424,8 @@ let
xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix {
inherit fetchurl fetchgit stdenv pkgconfig intltool freetype fontconfig
libxslt expat libdrm libpng zlib perl mesa_drivers
xkeyboard_config dbus libuuid openssl gperf m4
autoconf libtool xmlto asciidoc udev flex bison python mtdev pixman;
automake = automake110x;
dbus libuuid openssl gperf m4
autoconf automake libtool xmlto asciidoc udev flex bison python mtdev pixman;
mesa = mesa_noglu;
});
@ -7218,10 +7215,7 @@ let
inherit (xorg) fontsproto renderproto utilmacros xorgserver;
};
xf86_video_nouveau = callPackage ../os-specific/linux/xf86-video-nouveau {
inherit (xorg) xorgserver xproto fontsproto xf86driproto renderproto
videoproto utilmacros;
};
xf86_video_nouveau = xorg.xf86videonouveau;
xmoto = builderDefsPackage (import ../games/xmoto) {
inherit chipmunk sqlite curl zlib bzip2 libjpeg libpng
@ -7375,7 +7369,7 @@ let
xhtml1 = callPackage ../data/sgml+xml/schemas/xml-dtd/xhtml1 { };
xkeyboard_config = callPackage ../data/misc/xkeyboard-config { };
xkeyboard_config = xorg.xkeyboardconfig;
### APPLICATIONS

3
pkgs/top-level/release-small.nix
View File

@ -22,8 +22,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
aterm25 = all;
aterm28 = all;
autoconf = all;
automake110x = all;
automake111x = all;
automake = all;
avahi = allBut "i686-cygwin"; # Cygwin builds fail
bash = all;
bashInteractive = all;

7
pkgs/top-level/release.nix
View File

@ -35,6 +35,10 @@ let
# Ensure that X11/GTK+ are in order.
jobs.thunderbird.x86_64-linux
jobs.thunderbird.i686-linux
/* not ready yet
jobs.glib-tested.x86_64-linux # standard glib doesn't do checks
jobs.glib-tested.i686-linux
*/
];
};
@ -48,8 +52,7 @@ let
atlas = linux;
audacious = linux;
autoconf = all;
automake110x = all;
automake111x = all;
automake = all;
avahi = allBut "i686-cygwin"; # Cygwin builds fail
bash = all;
bashInteractive = all;