summary refs log tree commit diff
path: root/pkgs/servers/x11
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-06-14 17:33:56 +0200
committerGitHub <noreply@github.com>2021-06-14 17:33:56 +0200
commitc219b5eea449acfbf28bfddf55199125b21364eb (patch)
treea4503bbc574a72d77363c594f24dd87e2d4c662c /pkgs/servers/x11
parent4fac534d0ae48d107bd895f68453251580a1bbdc (diff)
parentb1370dea545cdd80b19bc8eb68a1a6dfee36f657 (diff)
downloadnixpkgs-c219b5eea449acfbf28bfddf55199125b21364eb.tar
nixpkgs-c219b5eea449acfbf28bfddf55199125b21364eb.tar.gz
nixpkgs-c219b5eea449acfbf28bfddf55199125b21364eb.tar.bz2
nixpkgs-c219b5eea449acfbf28bfddf55199125b21364eb.tar.lz
nixpkgs-c219b5eea449acfbf28bfddf55199125b21364eb.tar.xz
nixpkgs-c219b5eea449acfbf28bfddf55199125b21364eb.tar.zst
nixpkgs-c219b5eea449acfbf28bfddf55199125b21364eb.zip
Merge pull request #126367 from TredwellGit/xkeyboard_config
xkeyboard_config: 2.31 -> 2.33
Diffstat (limited to 'pkgs/servers/x11')
-rw-r--r--pkgs/servers/x11/xorg/default.nix6
-rw-r--r--pkgs/servers/x11/xorg/tarballs.list2
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index a7d52d0ff37..bf7e462cbd3 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2523,11 +2523,11 @@ lib.makeScope newScope (self: with self; {
   }) {};
 
   xkeyboardconfig = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, python3 }: stdenv.mkDerivation {
-    name = "xkeyboard-config-2.31";
+    name = "xkeyboard-config-2.33";
     builder = ./builder.sh;
     src = fetchurl {
-      url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.31.tar.bz2";
-      sha256 = "18xddaxh83zm698syh50w983jg6b7b8zgv0dfaf7ha485hgihi6s";
+      url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.33.tar.bz2";
+      sha256 = "1g6kn7l0mixw50kgn7d97gwv1990c5rczr2x776q3xywss8dfzv5";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     nativeBuildInputs = [ pkg-config python3 ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 1a04dbf476e..b44eebe6409 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -75,7 +75,7 @@ mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2
 mirror://xorg/individual/app/xwud-1.0.5.tar.bz2
 mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2
 mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2
-mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.31.tar.bz2
+mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.33.tar.bz2
 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2
 mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2
 mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2