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

Merge branch 'master' into closure-size

Browse Source 
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
This commit is contained in:
Vladimír Čunát
2016-04-01 10:06:01 +02:00
parent c643ccaa8c a26357eefe
commit ab15a62c68
1108 changed files with 76254 additions and 11297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/inputmethods/anthy/default.nix
View File

@@ -7,8 +7,8 @@ stdenv.mkDerivation {
description = "Hiragana text to Kana Kanji mixed text Japanese input method";
homepace = http://sourceforge.jp/projects/anthy/;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ericsagnes ];
platforms = platforms.linux;
maintainers = with maintainers; [ iyzsong ];
};
src = fetchurl {

2
pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix
View File

@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
description = "Fcitx Wrapper for anthy";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ iyzsong ericsagnes ];
maintainers = with maintainers; [ ericsagnes ];
};
}

2
pkgs/tools/inputmethods/fcitx/default.nix
View File

@@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
description = "A Flexible Input Method Framework";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [iyzsong ericsagnes];
maintainers = with stdenv.lib.maintainers; [ ericsagnes ];
};
}