Merge commit '8746c77a383f5c76153c7a181f3616d273acfa2a'

1 files changed, 17 insertions, 12 deletions

diff --git a/nixpkgs/pkgs/development/libraries/libpinyin/default.nix b/nixpkgs/pkgs/development/libraries/libpinyin/default.nix
index 26694eb37770..bf516b33d02a 100644
--- a/nixpkgs/pkgs/development/libraries/libpinyin/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpinyin/default.nix
@@ -1,31 +1,36 @@
-{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, glib, db, pkgconfig }:
+{ stdenv, fetchurl, fetchFromGitHub
+, autoreconfHook
+, glib
+, db
+, pkgconfig
+}:
 
 let
   modelData = fetchurl {
-    url    = "mirror://sourceforge/libpinyin/models/model14.text.tar.gz";
-    sha256 = "0qqk30nflj07zjhs231c95ln4yj4ipzwxxiwrxazrg4hb8bhypqq";
+    url    = "mirror://sourceforge/libpinyin/models/model17.text.tar.gz";
+    sha256 = "1kb2nswpsqlk2qm5jr7vqcp97f2dx7nvpk24lxjs1g12n252f5z0";
   };
 in
 stdenv.mkDerivation rec {
   name = "libpinyin-${version}";
-  version = "2.1.91";
-
-  nativeBuildInputs = [ autoreconfHook glib db pkgconfig ];
-
-  postUnpack = ''
-    tar -xzf ${modelData} -C $sourceRoot/data
-  '';
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner  = "libpinyin";
     repo   = "libpinyin";
     rev    = version;
-    sha256 = "0jbvn65p3zh0573hh27aasd3qly5anyfi8jnps2dxi0my09wbrq3";
+    sha256 = "14fkpp16s5k0pbw5wwd24pqr0qbdjgbl90n9aqwx72m03n7an40l";
   };
 
+  postUnpack = ''
+    tar -xzf ${modelData} -C $sourceRoot/data
+  '';
+
+  nativeBuildInputs = [ autoreconfHook glib db pkgconfig ];
+
   meta = with stdenv.lib; {
     description = "Library for intelligent sentence-based Chinese pinyin input method";
-    homepage    = https://sourceforge.net/projects/libpinyin;
+    homepage    = "https://sourceforge.net/projects/libpinyin";
     license     = licenses.gpl2;
     maintainers = with maintainers; [ ericsagnes ];
     platforms   = platforms.linux;