diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-09-24 21:18:23 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-09-24 21:18:23 +0200 |
| commit | 3a09a4b579612828277fa4b2c0e7cf84c16b3edf (patch) | |
| tree | 26cc5cc6fda1a3bd83045c590ae04e95847c86a0 /pkgs/servers/x11 | |
| parent | cc2f6c866f1013cd0cf620f199bcdba0d8e2fbc2 (diff) | |
| parent | f9197b9f63da8b6d9244c5a8e99507fdd294dcc5 (diff) | |
| download | nixlib-3a09a4b579612828277fa4b2c0e7cf84c16b3edf.tar nixlib-3a09a4b579612828277fa4b2c0e7cf84c16b3edf.tar.gz nixlib-3a09a4b579612828277fa4b2c0e7cf84c16b3edf.tar.bz2 nixlib-3a09a4b579612828277fa4b2c0e7cf84c16b3edf.tar.lz nixlib-3a09a4b579612828277fa4b2c0e7cf84c16b3edf.tar.xz nixlib-3a09a4b579612828277fa4b2c0e7cf84c16b3edf.tar.zst nixlib-3a09a4b579612828277fa4b2c0e7cf84c16b3edf.zip | |
Merge branch 'master' into staging
Hydra: ?compare=1480463
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs-7.7.list | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 561f8ba94d9f..06dd540a4818 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1760,11 +1760,11 @@ let }) // {inherit inputproto xorgserver xproto ;}; xf86inputlibinput = (mkDerivation "xf86inputlibinput" { - name = "xf86-input-libinput-0.26.0"; + name = "xf86-input-libinput-0.28.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-libinput-0.26.0.tar.bz2; - sha256 = "0yrqs88b7yn9nljwlxzn76jfmvf0sh939kzij5b2jvr2qa7mbjmb"; + url = mirror://xorg/individual/driver/xf86-input-libinput-0.28.0.tar.bz2; + sha256 = "189h8vl0005yizwrs4d0sng6j8lwkd3xi1zwqg8qavn2bw34v691"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ inputproto xorgserver xproto ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index b1a749c7ec4a..32a4e67642ad 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -335,10 +335,10 @@ in }; xf86inputlibinput = attrs: attrs // rec { - name = "xf86-input-libinput-0.26.0"; + name = "xf86-input-libinput-0.28.0"; src = args.fetchurl { url = "mirror://xorg/individual/driver/${name}.tar.bz2"; - sha256 = "0yrqs88b7yn9nljwlxzn76jfmvf0sh939kzij5b2jvr2qa7mbjmb"; + sha256 = "189h8vl0005yizwrs4d0sng6j8lwkd3xi1zwqg8qavn2bw34v691"; }; outputs = [ "out" "dev" ]; buildInputs = attrs.buildInputs ++ [ args.libinput ]; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 6e67e8eb6e14..ca77e6408149 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -123,7 +123,7 @@ mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.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.26.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-libinput-0.28.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 |