Skip to content

Commit

Permalink
xf86-input-synaptics: 1.8.3 -> 1.9.0
Browse files Browse the repository at this point in the history 
I'm getting new error in X.0.log:
"Synaptics driver unable to detect protocol"
but the touchpad still works fine.  It seems the driver is trying to
additionally apply to my regular (wireless) mouse which fails.
I hope this is just harmless.
  • Loading branch information
@vcunat
vcunat committed Dec 4, 2016
1 parent 374ac13 commit d34ccd1
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 34 deletions.
52 changes: 26 additions & 26 deletions pkgs/servers/x11/xorg/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1593,55 +1593,55 @@ let
}) // {inherit inputproto udev xorgserver xproto ;};

xf86inputjoystick = (mkDerivation "xf86inputjoystick" {
name = "xf86-input-joystick-1.6.2";
name = "xf86-input-joystick-1.6.3";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2;
sha256 = "038mfqairyyqvz02rk7v3i070sab1wr0k6fkxvyvxdgkfbnqcfzf";
url = mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2;
sha256 = "1awfq496d082brgjbr60lhm6jvr9537rflwxqdfqwfzjy3n6jxly";
};
buildInputs = [pkgconfig inputproto kbproto xorgserver xproto ];
meta.platforms = stdenv.lib.platforms.unix;
}) // {inherit inputproto kbproto xorgserver xproto ;};

xf86inputkeyboard = (mkDerivation "xf86inputkeyboard" {
name = "xf86-input-keyboard-1.8.1";
name = "xf86-input-keyboard-1.9.0";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2;
sha256 = "04d27kwqq03fc26an6051hs3i0bff8albhnngzyd59wxpwwzzj0s";
url = mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2;
sha256 = "12032yg412kyvnmc5fha1in7mpi651d8sa1bk4138s2j2zr01jgp";
};
buildInputs = [pkgconfig inputproto xorgserver xproto ];
meta.platforms = stdenv.lib.platforms.unix;
}) // {inherit inputproto xorgserver xproto ;};

xf86inputlibinput = (mkDerivation "xf86inputlibinput" {
name = "xf86-input-libinput-0.19.1";
name = "xf86-input-libinput-0.22.0";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2;
sha256 = "0381rnahg8mbzcisify092jyjycxzswpqg7dnqldrwjadx0ckwf7";
url = mirror://xorg/individual/driver/xf86-input-libinput-0.22.0.tar.bz2;
sha256 = "1qpaffl21xxjqcn4cqdfnd1gvxwdxizvvkimkypf4j6l5q3v8qn7";
};
buildInputs = [pkgconfig inputproto xorgserver xproto ];
meta.platforms = stdenv.lib.platforms.unix;
}) // {inherit inputproto xorgserver xproto ;};

xf86inputmouse = (mkDerivation "xf86inputmouse" {
name = "xf86-input-mouse-1.9.1";
name = "xf86-input-mouse-1.9.2";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2;
sha256 = "1kn5kx3qyn9qqvd6s24a2l1wfgck2pgfvzl90xpl024wfxsx719l";
url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2;
sha256 = "0bsbgww9421792zan43j60mndqprhfxhc48agsi15d3abjqda9gl";
};
buildInputs = [pkgconfig inputproto xorgserver xproto ];
meta.platforms = stdenv.lib.platforms.unix;
}) // {inherit inputproto xorgserver xproto ;};

xf86inputsynaptics = (mkDerivation "xf86inputsynaptics" {
name = "xf86-input-synaptics-1.8.3";
name = "xf86-input-synaptics-1.9.0";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/driver/xf86-input-synaptics-1.8.3.tar.bz2;
sha256 = "009zx199pilcvlaqm6fx4mg94q81d6vvl5rznmw3frzkfh6117yk";
url = mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2;
sha256 = "0niv0w1czbxh4y3qkqbpdp5gjwhp3379inwhknhif0m4sy4k5fmg";
};
buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ];
meta.platforms = stdenv.lib.platforms.unix;
Expand Down Expand Up @@ -1681,11 +1681,11 @@ let
}) // {inherit ;};

xf86videoamdgpu = (mkDerivation "xf86videoamdgpu" {
name = "xf86-video-amdgpu-1.1.2";
name = "xf86-video-amdgpu-1.2.0";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.2.tar.bz2;
sha256 = "0y87d4rhm5r71qpzcmmz4q37f3d3461jzh3sr99j7lbhdpnpzs3f";
url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.2.0.tar.bz2;
sha256 = "13vcwxswhzq611ly890fcl11vkpai7gs303l7nx5azqjbyn1lnr7";
};
buildInputs = [pkgconfig fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
meta.platforms = stdenv.lib.platforms.unix;
Expand Down Expand Up @@ -1714,11 +1714,11 @@ let
}) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};

xf86videoati = (mkDerivation "xf86videoati" {
name = "xf86-video-ati-7.7.1";
name = "xf86-video-ati-7.8.0";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/driver/xf86-video-ati-7.7.1.tar.bz2;
sha256 = "1387cn4b2wwawvzqmy17hrg9d394pl5r5if5jn831vk2vf48b980";
url = mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2;
sha256 = "1ynnm4v4261xmg94b7jam9hjyym4n2nqba23rv23v3wjfbkms7s0";
};
buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
meta.platforms = stdenv.lib.platforms.unix;
Expand Down Expand Up @@ -2067,15 +2067,15 @@ let
}) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;};

xf86videovmware = (mkDerivation "xf86videovmware" {
name = "xf86-video-vmware-13.1.0";
name = "xf86-video-vmware-13.2.1";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/driver/xf86-video-vmware-13.1.0.tar.bz2;
sha256 = "1k50whwnkzxam2ihc1sw456dx0pvr76naycm4qhyjxqv9d72879w";
url = mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2;
sha256 = "0azn3g0vcki47n5jddagk2rmbwdvp845k8p7d2r56zxs3w8ggxz2";
};
buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ];
buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ];
meta.platforms = stdenv.lib.platforms.unix;
}) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;};
}) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;};

xf86videovoodoo = (mkDerivation "xf86videovoodoo" {
name = "xf86-video-voodoo-1.2.5";
Expand Down
16 changes: 8 additions & 8 deletions pkgs/servers/x11/xorg/tarballs-7.7.list
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,17 +120,17 @@ 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.10.3.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.19.1.tar.bz2
mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2
mirror://xorg/individual/driver/xf86-input-synaptics-1.8.3.tar.bz2
mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2
mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2
mirror://xorg/individual/driver/xf86-input-libinput-0.22.0.tar.bz2
mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2
mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.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-amdgpu-1.1.2.tar.bz2
mirror://xorg/individual/driver/xf86-video-amdgpu-1.2.0.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.7.1.tar.bz2
mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-nouveau-1.0.13.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
Expand Down Expand Up @@ -162,7 +162,7 @@ mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2
mirror://xorg/individual/driver/xf86-video-trident-1.3.7.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-vesa-2.3.4.tar.bz2
mirror://xorg/individual/driver/xf86-video-vmware-13.1.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2
mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2
Expand Down

0 comments on commit d34ccd1

Please sign in to comment.