public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xorg xkeyboard-config: 2.17 -> 2.18

Browse Source
This commit is contained in:
Vladimír Čunát 2016-09-16 22:22:22 +02:00
parent 479f25a2bd
commit f12378e5b7
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/servers/x11/xorg/default.nix
View File

@ -2242,11 +2242,11 @@ let
}) // {inherit inputproto libX11 libXaw xproto libXt ;}; }) // {inherit inputproto libX11 libXaw xproto libXt ;};
xkeyboardconfig = (mkDerivation "xkeyboardconfig" { xkeyboardconfig = (mkDerivation "xkeyboardconfig" {
name = "xkeyboard-config-2.17"; name = "xkeyboard-config-2.18";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.17.tar.bz2; url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.18.tar.bz2;
sha256 = "00878f1v3034ki78pjpf2db0bh7jsmszsnxr3bf5qxripm2bxiny"; sha256 = "1l6x2w357ja8vm94ns79s7yj9a5dlr01r9dxrjvzwncadiyr27f4";
}; };
buildInputs = [pkgconfig libX11 xproto ]; buildInputs = [pkgconfig libX11 xproto ];
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;

2
pkgs/servers/x11/xorg/tarballs-7.7.list
View File

@ -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/xkbcomp-1.3.1.tar.bz2
mirror://xorg/individual/app/xkbevd-1.1.4.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/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/xkill-1.0.4.tar.bz2
mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2 mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2
mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2

10
pkgs/servers/x11/xorg/xkeyboard-config-eo.patch
View File

@ -17,26 +17,24 @@ index ec321f8..e9c3546 100644
<_shortDescription>Irn</_shortDescription> <_shortDescription>Irn</_shortDescription>
<_description>Iran</_description> <_description>Iran</_description>
diff --git a/symbols/Makefile.am b/symbols/Makefile.am diff --git a/symbols/Makefile.am b/symbols/Makefile.am
index 97c816d..d7e3a4e 100644
--- a/symbols/Makefile.am --- a/symbols/Makefile.am
+++ b/symbols/Makefile.am +++ b/symbols/Makefile.am
@@ -10,7 +10,7 @@ bt by braille \ @@ -10,7 +10,7 @@ bt by braille \
ca cd \ ca cd ch \
ch cn cz \ ch cn cz \
de dk \ de dk dz \
-ee es et epo eu \ -ee es et epo eu \
+ee eo es et epo eu \ +ee eo es et epo eu \
fi fo fr \ fi fo fr \
gb ge gh gn \ gb ge gh gn \
gr hr hu \ gr hr hu \
diff --git a/symbols/Makefile.in b/symbols/Makefile.in diff --git a/symbols/Makefile.in b/symbols/Makefile.in
index b5be077..5cddcc7 100644
--- a/symbols/Makefile.in --- a/symbols/Makefile.in
+++ b/symbols/Makefile.in +++ b/symbols/Makefile.in
@@ -222,7 +222,7 @@ bt by braille \ @@ -222,7 +222,7 @@ bt by braille \
ca cd \ ca cd ch \
ch cn cz \ ch cn cz \
de dk \ de dk dz \
-ee es et epo eu \ -ee es et epo eu \
+ee eo es et epo eu \ +ee eo es et epo eu \
fi fo fr \ fi fo fr \