Merge remote-tracking branch 'upstream/master' into gcc-7

Conflicts: pkgs/development/compilers/gcc/7/default.nix pkgs/development/libraries/SDL2/default.nix pkgs/top-level/all-packages.nix
2018-01-26 16:46:43 +02:00
parent 1830017289 4a2f7a73cc
commit 6a11ebfae9
4038 changed files with 152193 additions and 155007 deletions
@@ -212,6 +212,15 @@ in {
    };
  };

+  tr = buildDict {
+    shortName = "tr-0.50-0";
+    fullName = "Turkish";
+    src = fetchurl {
+      url = mirror://gnu/aspell/dict/tr/aspell-tr-0.50-0.tar.bz2;
+      sha256 = "0jpvpm96ga7s7rmsm6rbyrrr22b2dicxv2hy7ysv5y7bbq757ihb";
+    };
+  };
+
  uk = buildDict {
    shortName = "uk-1.4.0-0";
    fullName = "Ukrainian";