Merge staging-next into staging

2021-03-07 00:41:13 +00:00
parent 6329ac8111 5ae3107a21
commit f9d4095295
50 changed files with 368 additions and 146 deletions
--- a/pkgs/tools/inputmethods/anthy/default.nix
+++ b/pkgs/tools/inputmethods/anthy/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
    homepage    = "https://anthy.osdn.jp/";
    license     = licenses.gpl2Plus;
    maintainers = with maintainers; [ ericsagnes ];
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
  };

  src = fetchurl {
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
@@ -11,13 +11,13 @@

 stdenv.mkDerivation rec {
  pname = "ibus-bamboo";
-  version = "0.6.8";
+  version = "0.6.9";

  src = fetchFromGitHub {
    owner = "BambooEngine";
    repo = pname;
    rev = "v${version}";
-    sha256 = "17zgxqlsjkqyjywynqzmymw310aypcsjdrwnc7hx7v7xwal8iwjk";
+    sha256 = "sha256-7UXURvZX5UrpLHFYgBnuTX/sKQkubnBlvkSD/WBa4ZU=";
  };

  nativeBuildInputs = [