diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-05 09:53:01 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-05 09:53:01 +0100 |
commit | 556a28908e01ca1d44962d8570b5e73be949eca6 (patch) | |
tree | d60f8be5ec48b58f864b00abefbb783ea173b682 /pkgs/servers/x11 | |
parent | 7c879d342d58833174d2df9b7e7eae8fd0ecbf3d (diff) | |
parent | 16d0cd7c680b581f2356c1421454e4a7f24e9dd2 (diff) | |
download | nixlib-556a28908e01ca1d44962d8570b5e73be949eca6.tar nixlib-556a28908e01ca1d44962d8570b5e73be949eca6.tar.gz nixlib-556a28908e01ca1d44962d8570b5e73be949eca6.tar.bz2 nixlib-556a28908e01ca1d44962d8570b5e73be949eca6.tar.lz nixlib-556a28908e01ca1d44962d8570b5e73be949eca6.tar.xz nixlib-556a28908e01ca1d44962d8570b5e73be949eca6.tar.zst nixlib-556a28908e01ca1d44962d8570b5e73be949eca6.zip |
Merge: xorg and gtk-related updates
Diffstat (limited to 'pkgs/servers/x11')
-rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 50 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/old.list | 2 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/tarballs-7.7.list | 22 |
3 files changed, 48 insertions, 26 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 29653b6f1e15..b9ea5d7c5828 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -787,6 +787,16 @@ let meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; + libXfont2 = (mkDerivation "libXfont2" { + name = "libXfont2-2.0.1"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/lib/libXfont2-2.0.1.tar.bz2; + sha256 = "0znvwk36nhmyqpmhbm9mzisgixp1mp5qkfald8x1n5yxbm3vpyz9"; + }; + buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ]; + }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; + libXft = (mkDerivation "libXft" { name = "libXft-2.3.2"; builder = ./builder.sh; @@ -799,11 +809,11 @@ let }) // {inherit fontconfig freetype libX11 xproto libXrender ;}; libXi = (mkDerivation "libXi" { - name = "libXi-1.7.5"; + name = "libXi-1.7.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXi-1.7.5.tar.bz2; - sha256 = "0ad21jy40d8b2f9ldadx7lkspmvka1i9r5jqqfwxdxyqnpgdfr6r"; + url = mirror://xorg/individual/lib/libXi-1.7.6.tar.bz2; + sha256 = "1b5p0l19ynmd6blnqr205wyngh6fagl35nqb4v05dw60rr9aachz"; }; buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1591,11 +1601,11 @@ let }) // {inherit inputproto xorgserver xproto ;}; xf86inputlibinput = (mkDerivation "xf86inputlibinput" { - name = "xf86-input-libinput-0.15.0"; + name = "xf86-input-libinput-0.16.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-libinput-0.15.0.tar.bz2; - sha256 = "0hcs05zx9mpyi9wajsps9qsbyq4v0c9wysp2l48qnr4l8587qw18"; + url = mirror://xorg/individual/driver/xf86-input-libinput-0.16.0.tar.bz2; + sha256 = "0jbgnxsbr3g4g9vkspcc6pqy7av59zx5bb78vkvaqy8yx4qybbgx"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1855,11 +1865,11 @@ let }) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;}; xf86videonouveau = (mkDerivation "xf86videonouveau" { - name = "xf86-video-nouveau-1.0.11"; + name = "xf86-video-nouveau-1.0.12"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.11.tar.bz2; - sha256 = "0j3847rnffy81iaxxi6vnd8saadrc9jahfmckr0sjgkzg2rf4kzq"; + url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.12.tar.bz2; + sha256 = "07irv1zkk0rkyn1d7f2gn1icgcz2ix0pwv74sjian763gynmg80f"; }; buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1909,6 +1919,16 @@ let meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;}; + xf86videorendition = (mkDerivation "xf86videorendition" { + name = "xf86-video-rendition-4.2.6"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/driver/xf86-video-rendition-4.2.6.tar.bz2; + sha256 = "1a7rqafxzc2hd0s5pnq8s8j9d3jg64ndc0xnq4160kasyqhwy3k6"; + }; + buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; + }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; + xf86videos3virge = (mkDerivation "xf86videos3virge" { name = "xf86-video-s3virge-1.10.7"; builder = ./builder.sh; @@ -2207,11 +2227,11 @@ let }) // {inherit inputproto libX11 libXaw xproto libXt ;}; xkeyboardconfig = (mkDerivation "xkeyboardconfig" { - name = "xkeyboard-config-2.15"; + name = "xkeyboard-config-2.16"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.15.tar.bz2; - sha256 = "1grqdy5a9f2dii3y24fn0p3kz4q5g9j2kh3jcj2402rgrbvkqi0f"; + url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.16.tar.bz2; + sha256 = "0n0xinsljc5mww1qw7dfp8knv0f1r9hs6pdhl0fggdwn5hhiz2hy"; }; buildInputs = [pkgconfig libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -2295,11 +2315,11 @@ let }) // {inherit libX11 xproto ;}; xorgcffiles = (mkDerivation "xorgcffiles" { - name = "xorg-cf-files-1.0.5"; + name = "xorg-cf-files-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/xorg-cf-files-1.0.5.tar.bz2; - sha256 = "1m3ypq0xcy46ghxc0svl1rbhpy3zvgmy0aa2mn7w7v7d8d8bh8zd"; + url = mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2; + sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd"; }; buildInputs = [pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list index 92fed797d70f..801f6e0b7971 100644 --- a/pkgs/servers/x11/xorg/old.list +++ b/pkgs/servers/x11/xorg/old.list @@ -12,4 +12,4 @@ mirror://xorg/individual/proto/xf86miscproto-0.9.3.tar.bz2 mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2 mirror://xorg/individual/util/imake-1.0.7.tar.bz2 mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 -mirror://xorg/individual/util/xorg-cf-files-1.0.5.tar.bz2 +mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2 diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 7292c6711444..ddda39c76f7f 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -69,8 +69,9 @@ mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2 mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2 mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2 mirror://xorg/individual/lib/libXfont-1.5.1.tar.bz2 +mirror://xorg/individual/lib/libXfont2-2.0.1.tar.bz2 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2 -mirror://xorg/individual/lib/libXi-1.7.5.tar.bz2 +mirror://xorg/individual/lib/libXi-1.7.6.tar.bz2 mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2 mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2 mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2 @@ -118,19 +119,19 @@ 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.9.2.tar.bz2 +mirror://xorg/individual/driver/xf86-input-evdev-2.10.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-libinput-0.14.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-libinput-0.16.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-synaptics-1.8.2.tar.bz2 +mirror://xorg/individual/driver/xf86-input-synaptics-1.8.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-7.5.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-7.6.1.tar.bz2 mirror://xorg/individual/driver/glamor-egl-0.6.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-nouveau-1.0.11.tar.bz2 +mirror://xorg/individual/driver/xf86-video-nouveau-1.0.12.tar.bz2 mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-dummy-0.3.7.tar.bz2 @@ -150,6 +151,7 @@ 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.10.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-rendition-4.2.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-savage-2.3.8.tar.bz2 mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.8.tar.bz2 @@ -170,11 +172,11 @@ mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2 mirror://xorg/individual/app/xgc-1.0.5.tar.bz2 mirror://xorg/individual/app/xhost-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2 -mirror://xorg/individual/app/xinput-1.6.1.tar.bz2 -mirror://xorg/individual/app/xkbcomp-1.3.0.tar.bz2 +mirror://xorg/individual/app/xinput-1.6.2.tar.bz2 +mirror://xorg/individual/app/xkbcomp-1.3.1.tar.bz2 mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 -mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.15.tar.bz2 +mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.16.tar.bz2 mirror://xorg/individual/app/xkill-1.0.4.tar.bz2 mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2 @@ -182,7 +184,7 @@ mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2 mirror://xorg/individual/app/xmag-1.0.6.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.17.2.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.17.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 |