diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-04-07 05:32:57 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-04-07 05:32:57 +0200 |
| commit | 714ef27ffef04d18f07310a752f178ffddec395f (patch) | |
| tree | 502df908aea044ef50550f2e24365b5abd73f99e /pkgs/servers/x11 | |
| parent | 5e509a83ed29d4543bb97e807cb444400e14aac3 (diff) | |
| parent | 4cb48cc25622334f17ec6b9bf56e83de0d521fb7 (diff) | |
| download | nixpkgs-714ef27ffef04d18f07310a752f178ffddec395f.tar nixpkgs-714ef27ffef04d18f07310a752f178ffddec395f.tar.gz nixpkgs-714ef27ffef04d18f07310a752f178ffddec395f.tar.bz2 nixpkgs-714ef27ffef04d18f07310a752f178ffddec395f.tar.lz nixpkgs-714ef27ffef04d18f07310a752f178ffddec395f.tar.xz nixpkgs-714ef27ffef04d18f07310a752f178ffddec395f.tar.zst nixpkgs-714ef27ffef04d18f07310a752f178ffddec395f.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs.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 581847a7329..1173fc22370 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1717,11 +1717,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86inputlibinput = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation { - name = "xf86-input-libinput-0.30.0"; + name = "xf86-input-libinput-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-libinput-0.30.0.tar.bz2"; - sha256 = "1h4np66p87jf0c85ig524w8f5rbhl5gx8fww1qg0c55f87yzkizr"; + url = "mirror://xorg/individual/driver/xf86-input-libinput-1.0.0.tar.bz2"; + sha256 = "0x4ay9y2clm2bql3myqnvhmikjbpzy95c800qiva8pg6dbvc4mgg"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index a36c1642d68..61cfd4df180 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -81,7 +81,7 @@ mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.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.30.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-libinput-1.0.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 |