diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-11 18:44:55 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-11 18:44:55 +0100 |
| commit | 91b7fa9169cd5c9ac83f464e2f7aa8349fd00f55 (patch) | |
| tree | 15b91bf4f175c1bf4f2587978421695c2ff4cf7c /pkgs/servers/x11 | |
| parent | adffa870cf9226179bc56e202aeec7f5815bc4c3 (diff) | |
| parent | ef94c2171c5c0aa9b30ac92cfb3ae8909c3ec310 (diff) | |
| download | nixlib-91b7fa9169cd5c9ac83f464e2f7aa8349fd00f55.tar nixlib-91b7fa9169cd5c9ac83f464e2f7aa8349fd00f55.tar.gz nixlib-91b7fa9169cd5c9ac83f464e2f7aa8349fd00f55.tar.bz2 nixlib-91b7fa9169cd5c9ac83f464e2f7aa8349fd00f55.tar.lz nixlib-91b7fa9169cd5c9ac83f464e2f7aa8349fd00f55.tar.xz nixlib-91b7fa9169cd5c9ac83f464e2f7aa8349fd00f55.tar.zst nixlib-91b7fa9169cd5c9ac83f464e2f7aa8349fd00f55.zip | |
Merge master into x-updates
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs-7.7.list | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index ade60990d1ad..e0ef4fa43885 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -680,11 +680,11 @@ let })) // {inherit fixesproto libX11 xextproto xproto ;}; libXfont = (stdenv.mkDerivation ((if overrides ? libXfont then overrides.libXfont else x: x) { - name = "libXfont-1.4.6"; + name = "libXfont-1.4.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXfont-1.4.6.tar.bz2; - sha256 = "17vy2p8myxx8644yd05qsl2qvv9m3mhdbniw87mcw5ywai2zxjyh"; + url = mirror://xorg/individual/lib/libXfont-1.4.7.tar.bz2; + sha256 = "0hqm3nainxpc0922i4zbwzc768f69zkdf1gvkjqrdlim31aa6vni"; }; buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ]; })) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; @@ -1510,11 +1510,11 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) { - name = "xf86-video-intel-2.21.9"; + name = "xf86-video-intel-2.21.15"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-intel-2.21.9.tar.bz2; - sha256 = "12gigzpgbrz6g2gf4q5nj2sqmjw8fczbh79dlpx898llwk4wnn8k"; + url = mirror://xorg/individual/driver/xf86-video-intel-2.21.15.tar.bz2; + sha256 = "1z6ncmpszmwqi9xr590c4kp4gjjf7mndcr56r35x2bx7h87i8nkx"; }; buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ]; })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 4a7b72c09fcf..8a539c073a49 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -65,7 +65,7 @@ mirror://xorg/X11R7.7/src/everything/libXdamage-1.1.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXdmcp-1.1.1.tar.bz2 mirror://xorg/individual/lib/libXext-1.3.2.tar.bz2 mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2 -mirror://xorg/individual/lib/libXfont-1.4.6.tar.bz2 +mirror://xorg/individual/lib/libXfont-1.4.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXft-2.3.1.tar.bz2 mirror://xorg/individual/lib/libXi-1.7.2.tar.bz2 mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2 |