diff options
| author | Robin Gloster <mail@glob.in> | 2016-02-07 11:17:57 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-02-07 11:17:57 +0000 |
| commit | 9229e9c6563d88f1b9413ce128e022921089413f (patch) | |
| tree | cc1ce2eda51dd7cebe7a75e342cfcaf88c45e2f5 /pkgs/servers/x11 | |
| parent | 051662610104c2c57b89783084b9f31f5e978c71 (diff) | |
| parent | 6205f17ea43fd74e4aff14a24a5734ec33415fd7 (diff) | |
| download | nixlib-9229e9c6563d88f1b9413ce128e022921089413f.tar nixlib-9229e9c6563d88f1b9413ce128e022921089413f.tar.gz nixlib-9229e9c6563d88f1b9413ce128e022921089413f.tar.bz2 nixlib-9229e9c6563d88f1b9413ce128e022921089413f.tar.lz nixlib-9229e9c6563d88f1b9413ce128e022921089413f.tar.xz nixlib-9229e9c6563d88f1b9413ce128e022921089413f.tar.zst nixlib-9229e9c6563d88f1b9413ce128e022921089413f.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs-7.7.list | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index b9ea5d7c5828..bb9e73d31cd3 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1568,11 +1568,11 @@ let }) // {inherit ;}; xf86inputevdev = (mkDerivation "xf86inputevdev" { - name = "xf86-input-evdev-2.10.0"; + name = "xf86-input-evdev-2.10.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.0.tar.bz2; - sha256 = "05yihr84rf209yyjvin8ab55h504b30c7dck8kgrwykvn272k5yh"; + url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.1.tar.bz2; + sha256 = "05z05n39v8s2b0hwhcjb1bca7j8gc62bv9jxnibawwmjym3jp75g"; }; buildInputs = [pkgconfig inputproto udev xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index ddda39c76f7f..d0a812e45d6a 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -119,7 +119,7 @@ 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.10.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-evdev-2.10.1.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.16.0.tar.bz2 |