diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-09-16 22:22:22 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-09-16 22:41:18 +0200 |
| commit | f12378e5b7aecb1ba0fecb6851046aaca10093cf (patch) | |
| tree | 45ace6b30b576057b9e9e1a670573ce4a34f33c1 | |
| parent | 479f25a2bdea63b6eb28659a45ff6756de2e84e4 (diff) | |
| download | nixlib-f12378e5b7aecb1ba0fecb6851046aaca10093cf.tar nixlib-f12378e5b7aecb1ba0fecb6851046aaca10093cf.tar.gz nixlib-f12378e5b7aecb1ba0fecb6851046aaca10093cf.tar.bz2 nixlib-f12378e5b7aecb1ba0fecb6851046aaca10093cf.tar.lz nixlib-f12378e5b7aecb1ba0fecb6851046aaca10093cf.tar.xz nixlib-f12378e5b7aecb1ba0fecb6851046aaca10093cf.tar.zst nixlib-f12378e5b7aecb1ba0fecb6851046aaca10093cf.zip | |
xorg xkeyboard-config: 2.17 -> 2.18
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs-7.7.list | 2 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/xkeyboard-config-eo.patch | 10 |
3 files changed, 8 insertions, 10 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 23c39a1a7a23..b9e367794f99 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2242,11 +2242,11 @@ let }) // {inherit inputproto libX11 libXaw xproto libXt ;}; xkeyboardconfig = (mkDerivation "xkeyboardconfig" { - name = "xkeyboard-config-2.17"; + name = "xkeyboard-config-2.18"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.17.tar.bz2; - sha256 = "00878f1v3034ki78pjpf2db0bh7jsmszsnxr3bf5qxripm2bxiny"; + url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.18.tar.bz2; + sha256 = "1l6x2w357ja8vm94ns79s7yj9a5dlr01r9dxrjvzwncadiyr27f4"; }; buildInputs = [pkgconfig libX11 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 c0943e54a016..17dfd72c0051 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -175,7 +175,7 @@ mirror://xorg/individual/app/xinput-1.6.2.tar.bz2 mirror://xorg/individual/app/xkbcomp-1.3.1.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.17.tar.bz2 +mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.18.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 index 360768774db9..66f45a410f71 100644 --- a/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch +++ b/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch @@ -17,26 +17,24 @@ index ec321f8..e9c3546 100644 <_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 \ + ca cd ch \ ch cn cz \ - de dk \ + de dk dz \ -ee es et epo eu \ +ee eo es et epo eu \ 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 \ + ca cd ch \ ch cn cz \ - de dk \ + de dk dz \ -ee es et epo eu \ +ee eo es et epo eu \ fi fo fr \ |