Merge branch 'master' into x-updates

Conflicts (just taken x-updates):
	pkgs/servers/x11/xorg/overrides.nix

3 files changed, 358 insertions, 0 deletions

diff --git a/pkgs/desktops/kde-4.10/l10n/default.nix b/pkgs/desktops/kde-4.10/l10n/default.nix
new file mode 100644
index 000000000000..57d41fb35bf4
--- /dev/null
+++ b/pkgs/desktops/kde-4.10/l10n/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchurl, kdelibs, gettext, release, stable }:
+
+let
+
+  inherit (stdenv.lib) attrByPath singleton;
+
+  kdeL10nDerivation =
+    { lang, saneName, sha256 }:
+
+    stdenv.mkDerivation rec {
+      name = "kde-l10n-${saneName}-${release}";
+
+      src = fetchurl {
+        url = "mirror://kde/${if stable then "" else "un"}stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.xz";
+        name = "${name}.tar.xz";
+        inherit sha256;
+      };
+
+      buildInputs = [ gettext kdelibs ];
+
+      cmakeFlags = "-Wno-dev";
+
+      meta = {
+        description = "KDE translation for ${lang}";
+        license = "GPL";
+        inherit (kdelibs.meta) maintainers platforms homepage;
+      };
+    };
+
+  kdeL10nRelease =
+    builtins.listToAttrs (
+      map ({lang, saneName, sha256}:
+        {
+          name = saneName;
+          value = kdeL10nDerivation { inherit lang saneName sha256; };
+        }
+      ) (import (./manifest + "-${release}.nix"))
+    );
+
+in
+{
+  inherit kdeL10nDerivation;
+  recurseForDerivations = true;
+} // kdeL10nRelease
diff --git a/pkgs/desktops/kde-4.10/l10n/l10n-manifest.sh b/pkgs/desktops/kde-4.10/l10n/l10n-manifest.sh
new file mode 100755
index 000000000000..ec159a1e2047
--- /dev/null
+++ b/pkgs/desktops/kde-4.10/l10n/l10n-manifest.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+# Usage: download kde-l10n to $dir, then run
+# $0 $dir
+
+dir=$1
+
+if [[ ! -d "${dir}" ]]; then
+  echo "${dir} is not a directory (or doesn't exist)!" >&2
+  exit 1
+fi
+
+release=$(ls "${dir}"/kde-l10n-en_GB-*.tar.xz | \
+	sed -e 's/.*en_GB-//' -e 's/\.tar\.xz//')
+
+echo "Detected release ${release}" >&2
+
+exec > "manifest-${release}.nix"
+echo "["
+for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.xz`; do
+  lang=${i%-${release}.tar.xz}
+  lang=${lang#kde-l10n-}
+  echo -n "${lang}.. " >&2
+  hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
+  echo "{"
+  echo "  lang = \"${lang}\";"
+  echo "  saneName = \"$(echo $lang | sed s^@^_^g)\";"
+  echo "  sha256 = \"${hash}\";"
+  echo "}"
+  echo $hash >&2
+done
+echo "]"
diff --git a/pkgs/desktops/kde-4.10/l10n/manifest-4.10.2.nix b/pkgs/desktops/kde-4.10/l10n/manifest-4.10.2.nix
new file mode 100644
index 000000000000..93e47d2e63a2
--- /dev/null
+++ b/pkgs/desktops/kde-4.10/l10n/manifest-4.10.2.nix
@@ -0,0 +1,282 @@
+[
+{
+  lang = "ar";
+  saneName = "ar";
+  sha256 = "1si3hkxag2s93vywr8spiwaz8rr287b8ms0akw7ba4hr3mccgllz";
+}
+{
+  lang = "bg";
+  saneName = "bg";
+  sha256 = "1dfp2zkzj5h0qqz03sicdvw024afc49vlj59k973vqnziwqwkvil";
+}
+{
+  lang = "bs";
+  saneName = "bs";
+  sha256 = "0v56by3jxpn76dcbrz89np6par2ndmz6l9lgpyzi3qgh7c1flh3k";
+}
+{
+  lang = "ca";
+  saneName = "ca";
+  sha256 = "0xj157l9h6frac4pnfsirh06j7kdq37wlikm7rnybnpdg7nv4kls";
+}
+{
+  lang = "ca@valencia";
+  saneName = "ca_valencia";
+  sha256 = "0zrc3cpbiarsfh2jqrrhxalmz62k5bb9wf9vbfcvbh90a0v5csaw";
+}
+{
+  lang = "cs";
+  saneName = "cs";
+  sha256 = "1scy726cxyv6gmh77wnfb8qb00vhhxxg1wwg8lk56r79jsh77pbh";
+}
+{
+  lang = "da";
+  saneName = "da";
+  sha256 = "1qdhzw9v1q188bky8phv3wj0sj3imf08j3bqqf2gcniw2zr0nkhq";
+}
+{
+  lang = "de";
+  saneName = "de";
+  sha256 = "13r97in3yl17scq41fncbzp3s99c2ahspxixcjb5b066c9ln4n4z";
+}
+{
+  lang = "el";
+  saneName = "el";
+  sha256 = "0c3w2cxmv46l85kg9d68v037br0ck423k0zfkyi01hgh76jixhnm";
+}
+{
+  lang = "en_GB";
+  saneName = "en_GB";
+  sha256 = "158i25z1b5hj5fhhsczf52l2369xmzyxfjjr1xp9pp5aga2kp3dc";
+}
+{
+  lang = "es";
+  saneName = "es";
+  sha256 = "0vm2sr5nqzjssm2mzjw56wwsygzasrr04pl77y4mvq1d573gaks3";
+}
+{
+  lang = "et";
+  saneName = "et";
+  sha256 = "0w4dqvgain4m14cr8vmr49a890lmjiz203vw347fyq6mvqg57f3z";
+}
+{
+  lang = "eu";
+  saneName = "eu";
+  sha256 = "1809g1jdbrp22572h68zr7a5riymzv240hpmh633v8qmdqyzmnlk";
+}
+{
+  lang = "fa";
+  saneName = "fa";
+  sha256 = "1y1m9zagw1wras6vfrw6zbhy08xm1djfg7wg0fqvr2pnw01b903f";
+}
+{
+  lang = "fi";
+  saneName = "fi";
+  sha256 = "0fd6zbxn1dcq3i8vp6m4ifsrfhpghbgvwrh0gqmpw60kr9ms72pj";
+}
+{
+  lang = "fr";
+  saneName = "fr";
+  sha256 = "1ybdnvsb2fi8hymad4fj7dhgfqjabbhgjgmcs4g0px583gbx38ys";
+}
+{
+  lang = "ga";
+  saneName = "ga";
+  sha256 = "1hcdx82213dhy6v2hy9c543fci8pj3p5lz2bb0sds14wscryngiy";
+}
+{
+  lang = "gl";
+  saneName = "gl";
+  sha256 = "0p0k0r42wqp9ww0w4k4dp0cp9mv4is1zffsnpb1vdj8fr4n73lms";
+}
+{
+  lang = "he";
+  saneName = "he";
+  sha256 = "0wfyx7w2igz078f9s3nf2gr2s2bj6kdrpsd4cycdrvi7lpkv97mg";
+}
+{
+  lang = "hi";
+  saneName = "hi";
+  sha256 = "0nr6lskvq4v885hlnwyn5c6r76lj923lnmzz7f3ymxsm8ahgy9i1";
+}
+{
+  lang = "hr";
+  saneName = "hr";
+  sha256 = "1zg11q416rlcwygbapllmhwy577gwrvxyrr2hv0knz8r6jdwxnxj";
+}
+{
+  lang = "hu";
+  saneName = "hu";
+  sha256 = "1km3w6m7m3w3315ivy80rwmn82g41cfw3id21ks8sykqray60jyf";
+}
+{
+  lang = "ia";
+  saneName = "ia";
+  sha256 = "1rb6qsvhp8r7ivsjcp2980vdkb5pczxky6wix884xdd2jyb4dqbs";
+}
+{
+  lang = "is";
+  saneName = "is";
+  sha256 = "0kngwsasyw36g05xbxcgn71mkl89xs3sg8lx3qzd6g7drk2s5r1w";
+}
+{
+  lang = "it";
+  saneName = "it";
+  sha256 = "1ckb7alln8f72x9q6hi4ji7xylaipd3zwilnrr7978y1q5b8297l";
+}
+{
+  lang = "ja";
+  saneName = "ja";
+  sha256 = "1s0m6kl0wdd22pbnrnmxq19y1nzyvmln64g5gqr9c33x08lwd3jz";
+}
+{
+  lang = "kk";
+  saneName = "kk";
+  sha256 = "1jn3pd4j5jpw8ing7hi0npkrk4cy5vbfp62jcpn93dizq71g0cis";
+}
+{
+  lang = "km";
+  saneName = "km";
+  sha256 = "1y6492rmh8hw3fw8yss80j8dnn6gah4mp207wnjx7savxdganrk9";
+}
+{
+  lang = "ko";
+  saneName = "ko";
+  sha256 = "05r7cslynx4yxlkaqq2lhjg2rmvjzz74h41if5fj3lkm9p848663";
+}
+{
+  lang = "lt";
+  saneName = "lt";
+  sha256 = "1xa7jc3jbhicqzikayssmm08mnqwhwy3gbr2xp2wyxvrwgy0vd7b";
+}
+{
+  lang = "lv";
+  saneName = "lv";
+  sha256 = "1xr2938yqkl81rwcfg43mqksm9r6zcw5bp49cm5ybrrr1np08d4p";
+}
+{
+  lang = "mr";
+  saneName = "mr";
+  sha256 = "0w4g863da74vabbx6dc7hpf6lqa09bsxm5bdl33bqp6wxz0qbrxf";
+}
+{
+  lang = "nb";
+  saneName = "nb";
+  sha256 = "1axqkkwgm3x12fpfnvxzm2bf22rh2fxic15rrk70sjc0xzkmbfc2";
+}
+{
+  lang = "nds";
+  saneName = "nds";
+  sha256 = "1y72jrw7s6afznj0axwrxczvcxm2i3m9dldjjb32w8lr2gbibhz9";
+}
+{
+  lang = "nl";
+  saneName = "nl";
+  sha256 = "01ps3fgwhzffsb52zcjgi4frgy719wlgjmrva9hl320wgi6bgs30";
+}
+{
+  lang = "nn";
+  saneName = "nn";
+  sha256 = "0a9zrn54x38c4jn2p59s3wiv42g1f7nwar2gppn992q2awq05m6x";
+}
+{
+  lang = "pa";
+  saneName = "pa";
+  sha256 = "1782vpj199ck5fswv3jc0adff0k7bv699b4la604kb0a7dl43cf2";
+}
+{
+  lang = "pl";
+  saneName = "pl";
+  sha256 = "0lldhl2jd51j3srf2dqq6gd4nxy6y3qxd585bgxpclvnmz7zqq9b";
+}
+{
+  lang = "pt";
+  saneName = "pt";
+  sha256 = "10w740h5h3ag2jpj44xyclpya59d8jmgv5ma1rz27wcvwl38jggx";
+}
+{
+  lang = "pt_BR";
+  saneName = "pt_BR";
+  sha256 = "1rn5jc9dihi0mwvly1rk1fqzdbhyg9gxax1bip0l80wg8mj9d0h5";
+}
+{
+  lang = "ro";
+  saneName = "ro";
+  sha256 = "1l1b9j9ixianyvbg2msc4d4bkm2km3w0h6xkbcyl7rg0cja9ys8l";
+}
+{
+  lang = "ru";
+  saneName = "ru";
+  sha256 = "0rgasg2c0ds96yqky1rnqj7fc9w3g6p0ng27v5vq3ja7paij1yv9";
+}
+{
+  lang = "si";
+  saneName = "si";
+  sha256 = "0124dhn1ng225zhyz8lmc2lf6cpxbbirr3bl3h6cq8lyjs4p078l";
+}
+{
+  lang = "sk";
+  saneName = "sk";
+  sha256 = "0xfp2wh1qyyh1cixypam9qnni0zin580vcbnhpmbx5disy3znmga";
+}
+{
+  lang = "sl";
+  saneName = "sl";
+  sha256 = "1hfqq8k5n48hjypj5sribh761gpgn930410qbdnrxjmm0l95rzlp";
+}
+{
+  lang = "sr";
+  saneName = "sr";
+  sha256 = "1rma3l9mpm1xakkf2mkjpa6nxhl076hnm6fiirna7nsgvsk2c3jz";
+}
+{
+  lang = "sv";
+  saneName = "sv";
+  sha256 = "02rg9hm0j1lfdv9nb80bh4yy41z3rvfh39w8xwrmv941y6k58q7w";
+}
+{
+  lang = "tg";
+  saneName = "tg";
+  sha256 = "16731c2bjg3c8r7i6lm6j3gsj9yqs2yd69sl04y9nv5yh1i0km15";
+}
+{
+  lang = "th";
+  saneName = "th";
+  sha256 = "032zwwn5za8cknmqxd8yzr3djylnvrzjldgygqlshf0pxkryjkrp";
+}
+{
+  lang = "tr";
+  saneName = "tr";
+  sha256 = "1bp8bndwyw33rkkv2dhs1l9qbzkhccsrqcflxnjrm98shks2vgzr";
+}
+{
+  lang = "ug";
+  saneName = "ug";
+  sha256 = "0hhdj4yb208rmpd9a77jf7x9p5iq35iyvn68sr6n1m228pncddi6";
+}
+{
+  lang = "uk";
+  saneName = "uk";
+  sha256 = "0sw07alwjw7qiss93bgf4h5ix9kpz2czfwbbgdydfwqcwz5nzvcy";
+}
+{
+  lang = "vi";
+  saneName = "vi";
+  sha256 = "06fchmphkp7rpg6i0gd50qyjlfr6drj0xnlkdczw54iy1zklrlmh";
+}
+{
+  lang = "wa";
+  saneName = "wa";
+  sha256 = "1pm3wvs88h03gch6nzn5hd268r2q4jd13slh6bh2nvhq719g8zsa";
+}
+{
+  lang = "zh_CN";
+  saneName = "zh_CN";
+  sha256 = "0k8j3dprpzxi87rd6xhp1qr93jg91i0hym87y7wlqb239aqz41dn";
+}
+{
+  lang = "zh_TW";
+  saneName = "zh_TW";
+  sha256 = "05ks7gdl3x6wkxs2rdj6f48bpd4cishw9zfh0a264kix6mh2fzcq";
+}
+]