xkeyboard-config: updates

Also drop Esperanto patch for now, as it doesn't apply anymore
and there are some Esperanto variants inside. Discussed:
https://github.com/NixOS/nixpkgs/commit/fa5a583098

4 files changed, 6 insertions, 78 deletions

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 576f6920896..6b7f51412cc 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1975,11 +1975,11 @@ let
   }) // {inherit inputproto libX11 libXaw xproto libXt ;};
 
   xkeyboardconfig = (mkDerivation "xkeyboardconfig" {
-    name = "xkeyboard-config-2.11";
+    name = "xkeyboard-config-2.15";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.11.tar.bz2;
-      sha256 = "0xkdyyi759hzls42hp4j3q2lc35n4j6b2g44ilx5qarci5h584p7";
+      url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.15.tar.bz2;
+      sha256 = "1grqdy5a9f2dii3y24fn0p3kz4q5g9j2kh3jcj2402rgrbvkqi0f";
     };
     buildInputs = [pkgconfig libX11 xproto ];
   }) // {inherit libX11 xproto ;};
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index fdec469d1ff..283eb683ffc 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -256,15 +256,14 @@ in
   };
 
   xkbcomp = attrs: attrs // {
-    configureFlags = "--with-xkb-config-root=${xorg.xkeyboardconfig}/share/X11/xkb"; 
+    configureFlags = "--with-xkb-config-root=${xorg.xkeyboardconfig}/share/X11/xkb";
   };
 
   xkeyboardconfig = attrs: attrs // {
 
     buildInputs = attrs.buildInputs ++ [args.intltool];
 
-    #TODO: resurrect patches for US_intl?
-    patches = [ ./xkeyboard-config-eo.patch ];
+    #TODO: resurrect patches for US_intl or Esperanto?
 
     # 1: compatibility for X11/xkb location
     # 2: I think pkgconfig/ is supposed to be in /lib/
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 73c6cc88c8a..7522743310a 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -171,7 +171,7 @@ mirror://xorg/individual/app/xinput-1.6.1.tar.bz2
 mirror://xorg/individual/app/xkbcomp-1.3.0.tar.bz2
 mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2
 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2
-mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.11.tar.bz2
+mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.15.tar.bz2
 mirror://xorg/individual/app/xkill-1.0.4.tar.bz2
 mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2
 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2
diff --git a/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch b/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch
deleted file mode 100644
index f288a5c0f6d..00000000000
--- a/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff --git a/rules/base.xml.in b/rules/base.xml.in
-index ec321f8..e9c3546 100644
---- a/rules/base.xml.in
-+++ b/rules/base.xml.in
-@@ -1786,6 +1786,13 @@
-     </layout>
-     <layout>
-       <configItem>
-+        <name>eo</name>
-+        <_shortDescription>Esp</_shortDescription>
-+        <_description>Esperanto</_description>
-+      </configItem>
-+    </layout>
-+    <layout>
-+      <configItem>
-         <name>ir</name>
-         <_shortDescription>Irn</_shortDescription>
-         <_description>Iran</_description>
-diff --git a/symbols/Makefile.am b/symbols/Makefile.am
-index 97c816d..d7e3a4e 100644
---- a/symbols/Makefile.am
-+++ b/symbols/Makefile.am
-@@ -10,7 +10,7 @@ bt by braille \
- ca cd \
- ch cn cz \
- de dk \
--ee es et epo \
-+ee eo es et epo \
- fi fo fr \
- gb ge gh gn \
- gr hr hu \
-diff --git a/symbols/Makefile.in b/symbols/Makefile.in
-index b5be077..5cddcc7 100644
---- a/symbols/Makefile.in
-+++ b/symbols/Makefile.in
-@@ -222,7 +222,7 @@ bt by braille \
- ca cd \
- ch cn cz \
- de dk \
--ee es et epo \
-+ee eo es et epo \
- fi fo fr \
- gb ge gh gn \
- gr hr hu \
-diff --git a/symbols/eo b/symbols/eo
-new file mode 100644
-index 0000000..d6358c9
---- /dev/null
-+++ b/symbols/eo
-@@ -0,0 +1,21 @@
-+// $XFree86$
-+
-+partial alphanumeric_keys
-+xkb_symbols "basic" {
-+
-+     // Describes the differences between a very simple en_US
-+     // keyboard and a simple Esperanto keyboard
-+     // Press AltGr or Windows Menu key together with C, H, J, S, U
-+     // to get accented letters.
-+     // 2001 by Radovan Garabik <garabik@melkor.dnp.fmph.uniba.sk>
-+
-+    key.type = "FOUR_LEVEL";
-+
-+    key <AD02>  { [w,W, ubreve,Ubreve ] };
-+    key <AD07>  { [u,U, ubreve, Ubreve ] };
-+    key <AC02>  { [s,S, scircumflex,    Scircumflex ] };
-+    key <AC05>  { [g,G, gcircumflex,Gcircumflex ] };
-+    key <AC06>  { [h,H, hcircumflex,Hcircumflex ] };
-+    key <AC07>  { [j,J, jcircumflex,Jcircumflex ] };
-+    key <AB03>  { [c,C, ccircumflex,Ccircumflex ] };
-+};