about summary refs log tree commit diff
diff options
context:
space:
mode:
authortaku0 <mxxouy6x3m_github@tatapa.org>2017-04-23 11:42:59 +0900
committertaku0 <mxxouy6x3m_github@tatapa.org>2017-04-23 11:42:59 +0900
commit5bcaeda4c8c3bbb442049cb95c10dce602416089 (patch)
treea1cf02d62d901eadc6e1edc68e97cdde826be312
parent26f5fa8f974aba0c08376e995deb8c50aff48727 (diff)
downloadnixlib-5bcaeda4c8c3bbb442049cb95c10dce602416089.tar
nixlib-5bcaeda4c8c3bbb442049cb95c10dce602416089.tar.gz
nixlib-5bcaeda4c8c3bbb442049cb95c10dce602416089.tar.bz2
nixlib-5bcaeda4c8c3bbb442049cb95c10dce602416089.tar.lz
nixlib-5bcaeda4c8c3bbb442049cb95c10dce602416089.tar.xz
nixlib-5bcaeda4c8c3bbb442049cb95c10dce602416089.tar.zst
nixlib-5bcaeda4c8c3bbb442049cb95c10dce602416089.zip
hunspell: 1.3.3 -> 1.6.1
-rw-r--r--pkgs/development/libraries/hunspell/default.nix13
-rw-r--r--pkgs/development/libraries/qtwebkit-plugins/default.nix2
-rw-r--r--pkgs/games/mudlet/libs.patch2
3 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix
index c33434d202f5..952050f0e8f7 100644
--- a/pkgs/development/libraries/hunspell/default.nix
+++ b/pkgs/development/libraries/hunspell/default.nix
@@ -1,16 +1,21 @@
-{ stdenv, fetchurl, ncurses, readline }:
+{ stdenv, fetchurl, ncurses, readline, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "hunspell-1.3.3";
+  version = "1.6.1";
+  name = "hunspell-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/hunspell/${name}.tar.gz";
-    sha256 = "0v14ff9s37vkh45diaddndcrj0hmn67arh8xh8k79q9c1vgc1cm7";
+    url = "https://github.com/hunspell/hunspell/archive/v${version}.tar.gz";
+    sha256 = "0j9c20sj7bgd6f77193g1ihy8w905byk2gdhdc0r9dsh7irr7x9h";
   };
 
   outputs = [ "bin" "dev" "out" "man" ];
 
   buildInputs = [ ncurses readline ];
+  nativeBuildInputs = [ autoreconfHook ];
+
+  autoreconfFlags = "-vfi";
+
   configureFlags = [ "--with-ui" "--with-readline" ];
 
   hardeningDisable = [ "format" ];
diff --git a/pkgs/development/libraries/qtwebkit-plugins/default.nix b/pkgs/development/libraries/qtwebkit-plugins/default.nix
index fbb2ffdd83b8..73e629451135 100644
--- a/pkgs/development/libraries/qtwebkit-plugins/default.nix
+++ b/pkgs/development/libraries/qtwebkit-plugins/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   buildInputs = [ qtwebkit hunspell ];
 
   postPatch = ''
-    sed -i "s,-lhunspell,-lhunspell-1.3," src/spellcheck/spellcheck.pri
+    sed -i "s,-lhunspell,-lhunspell-1.6," src/spellcheck/spellcheck.pri
     sed -i "s,\$\$\[QT_INSTALL_PLUGINS\],$out/lib/qt5/plugins," src/src.pro
   '';
 
diff --git a/pkgs/games/mudlet/libs.patch b/pkgs/games/mudlet/libs.patch
index 3943c16e0eab..45b693828ff2 100644
--- a/pkgs/games/mudlet/libs.patch
+++ b/pkgs/games/mudlet/libs.patch
@@ -7,7 +7,7 @@
 -        -llua5.1 \
 -        -lhunspell \
 +        -llua \
-+        -lhunspell-1.3 \
++        -lhunspell-1.6 \
          -L/usr/local/lib/ \
          -lyajl \
          -lGLU \