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

Merge pull request #60348 from matthewbauer/enchant-updates

Browse Source 
enchant: 1.6.1 -> 2.2.3
This commit is contained in:
Matthew Bauer 2019-06-03 13:34:16 -04:00 committed by GitHub
commit c3f6b46db6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/irc/hexchat/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, gtk2, lua, perl, python2 { stdenv, fetchFromGitHub, pkgconfig, gtk2, lua, perl, python2
, libtool, pciutils, dbus-glib, libcanberra-gtk2, libproxy , libtool, pciutils, dbus-glib, libcanberra-gtk2, libproxy
, libsexy, enchant, libnotify, openssl, intltool , libsexy, enchant1, libnotify, openssl, intltool
, desktop-file-utils, hicolor-icon-theme , desktop-file-utils, hicolor-icon-theme
, autoconf, automake, autoconf-archive , autoconf, automake, autoconf-archive
}: }:
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
#hexchat and heachat-text loads enchant spell checking library at run time and so it needs to have route to the path #hexchat and heachat-text loads enchant spell checking library at run time and so it needs to have route to the path
patchPhase = '' patchPhase = ''
sed -i "s,libenchant.so.1,${enchant}/lib/libenchant.so.1,g" src/fe-gtk/sexy-spell-entry.c sed -i "s,libenchant.so.1,${enchant1}/lib/libenchant.so.1,g" src/fe-gtk/sexy-spell-entry.c
''; '';
preConfigure = '' preConfigure = ''

4
pkgs/desktops/gnome-2/default.nix
View File

@ -47,9 +47,9 @@ lib.makeScope pkgs.newScope (self: with self; {
libbonoboui = callPackage ./platform/libbonoboui { }; libbonoboui = callPackage ./platform/libbonoboui { };
gtkhtml = callPackage ./platform/gtkhtml { }; gtkhtml = callPackage ./platform/gtkhtml { enchant = pkgs.enchant1; };
gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { }; gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { enchant = pkgs.enchant1; };
gtkglext = callPackage ./platform/gtkglext { }; gtkglext = callPackage ./platform/gtkglext { };

4
pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk3, intltool, { stdenv, fetchurl, pkgconfig, gtk3, intltool, fetchpatch
GConf, enchant, isocodes, gnome_icon_theme, gsettings-desktop-schemas }: , GConf, enchant, isocodes, gnome_icon_theme, gsettings-desktop-schemas }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "4.10.0"; version = "4.10.0";

2
pkgs/desktops/gnome-3/default.nix
View File

@ -347,7 +347,7 @@ lib.makeScope pkgs.newScope (self: with self; {
pidgin-im-gnome-shell-extension = callPackage ./misc/pidgin { }; pidgin-im-gnome-shell-extension = callPackage ./misc/pidgin { };
gtkhtml = callPackage ./misc/gtkhtml { }; gtkhtml = callPackage ./misc/gtkhtml { enchant = pkgs.enchant1; };
pomodoro = callPackage ./misc/pomodoro { }; pomodoro = callPackage ./misc/pomodoro { };

2
pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk3, intltool { stdenv, fetchurl, pkgconfig, gtk3, intltool, fetchpatch
, gnome3, enchant, isocodes, gsettings-desktop-schemas }: , gnome3, enchant, isocodes, gsettings-desktop-schemas }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

0
pkgs/development/libraries/enchant/default.nix → pkgs/development/libraries/enchant/1.x.nix
View File

6
pkgs/development/libraries/gtkspell/3.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant2, isocodes, intltool, gobject-introspection, vala}: {stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, isocodes, intltool, gobject-introspection, vala}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gtkspell-${version}"; name = "gtkspell-${version}";
@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig intltool gobject-introspection vala ]; nativeBuildInputs = [ pkgconfig intltool gobject-introspection vala ];
buildInputs = [ aspell gtk3 enchant2 isocodes ]; buildInputs = [ aspell gtk3 enchant isocodes ];
propagatedBuildInputs = [ enchant2 ]; propagatedBuildInputs = [ enchant ];
configureFlags = [ configureFlags = [
"--enable-introspection" "--enable-introspection"

5
pkgs/development/python-modules/pyenchant/default.nix
View File

@ -13,10 +13,10 @@ buildPythonPackage rec {
sha256 = "fc31cda72ace001da8fe5d42f11c26e514a91fa8c70468739216ddd8de64e2a0"; sha256 = "fc31cda72ace001da8fe5d42f11c26e514a91fa8c70468739216ddd8de64e2a0";
}; };
propagatedBuildInputs = [ pkgs.enchant ]; propagatedBuildInputs = [ pkgs.enchant1 ];
patchPhase = let patchPhase = let
path_hack_script = "s|LoadLibrary(e_path)|LoadLibrary('${pkgs.enchant}/lib/' + e_path)|"; path_hack_script = "s|LoadLibrary(e_path)|LoadLibrary('${pkgs.enchant1}/lib/' + e_path)|";
in '' in ''
sed -i "${path_hack_script}" enchant/_enchant.py sed -i "${path_hack_script}" enchant/_enchant.py
@ -31,6 +31,7 @@ buildPythonPackage rec {
description = "pyenchant: Python bindings for the Enchant spellchecker"; description = "pyenchant: Python bindings for the Enchant spellchecker";
homepage = https://pythonhosted.org/pyenchant/; homepage = https://pythonhosted.org/pyenchant/;
license = licenses.lgpl21; license = licenses.lgpl21;
badPlatforms = [ "x86_64-darwin" ];
}; };
} }

4
pkgs/development/python-modules/pylint/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, python, pythonOlder, astroid, { stdenv, lib, buildPythonPackage, fetchPypi, python, pythonOlder, astroid,
isort, mccabe, pytest, pytestrunner, pyenchant }: isort, mccabe, pytest, pytestrunner }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pylint"; pname = "pylint";
@ -14,7 +14,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ pytestrunner ]; nativeBuildInputs = [ pytestrunner ];
checkInputs = [ pytest pyenchant ]; checkInputs = [ pytest ];
propagatedBuildInputs = [ astroid isort mccabe ]; propagatedBuildInputs = [ astroid isort mccabe ];

4
pkgs/tools/inputmethods/fcitx/unwrapped.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, cmake, intltool, gettext { stdenv, fetchurl, pkgconfig, cmake, intltool, gettext
, libxml2, enchant, isocodes, icu, libpthreadstubs , libxml2, enchant1, isocodes, icu, libpthreadstubs
, pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon , pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon
, dbus, gtk2, gtk3, qt4, extra-cmake-modules , dbus, gtk2, gtk3, qt4, extra-cmake-modules
, xkeyboard_config, pcre, libuuid , xkeyboard_config, pcre, libuuid
@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake extra-cmake-modules intltool pkgconfig pcre ]; nativeBuildInputs = [ cmake extra-cmake-modules intltool pkgconfig pcre ];
buildInputs = [ buildInputs = [
xkeyboard_config enchant gettext isocodes icu libpthreadstubs libXau libXdmcp libxkbfile xkeyboard_config enchant1 gettext isocodes icu libpthreadstubs libXau libXdmcp libxkbfile
libxkbcommon libxml2 dbus cairo gtk2 gtk3 pango qt4 libuuid libxkbcommon libxml2 dbus cairo gtk2 gtk3 pango qt4 libuuid
]; ];

12
pkgs/top-level/all-packages.nix
View File

@ -10197,9 +10197,10 @@ in
elastix = callPackage ../development/libraries/science/biology/elastix { }; elastix = callPackage ../development/libraries/science/biology/elastix { };
enchant = callPackage ../development/libraries/enchant { }; enchant1 = callPackage ../development/libraries/enchant/1.x.nix { };
enchant2 = callPackage ../development/libraries/enchant/2.x.nix { }; enchant2 = callPackage ../development/libraries/enchant/2.x.nix { };
enchant = enchant2;
enet = callPackage ../development/libraries/enet { }; enet = callPackage ../development/libraries/enet { };
@ -10797,7 +10798,7 @@ in
gtksourceviewmm4 = callPackage ../development/libraries/gtksourceviewmm/4.x.nix { }; gtksourceviewmm4 = callPackage ../development/libraries/gtksourceviewmm/4.x.nix { };
gtkspell2 = callPackage ../development/libraries/gtkspell { }; gtkspell2 = callPackage ../development/libraries/gtkspell { enchant = enchant1; };
gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { }; gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { };
@ -13277,7 +13278,7 @@ in
subdl = callPackage ../applications/video/subdl { }; subdl = callPackage ../applications/video/subdl { };
subtitleeditor = callPackage ../applications/video/subtitleeditor { }; subtitleeditor = callPackage ../applications/video/subtitleeditor { enchant = enchant1; };
suil = callPackage ../development/libraries/audio/suil { }; suil = callPackage ../development/libraries/audio/suil { };
@ -20991,7 +20992,9 @@ in
xmind = callPackage ../applications/misc/xmind { }; xmind = callPackage ../applications/misc/xmind { };
xneur = callPackage ../applications/misc/xneur { }; xneur = callPackage ../applications/misc/xneur {
enchant = enchant1;
};
gxneur = callPackage ../applications/misc/gxneur { gxneur = callPackage ../applications/misc/gxneur {
inherit (gnome2) libglade GConf; inherit (gnome2) libglade GConf;
@ -21002,6 +21005,7 @@ in
inherit (gnome2) libglade scrollkeeper; inherit (gnome2) libglade scrollkeeper;
gtkhtml = gnome2.gtkhtml4; gtkhtml = gnome2.gtkhtml4;
python = python27; python = python27;
enchant = enchant1;
}; };
xournal = callPackage ../applications/graphics/xournal { xournal = callPackage ../applications/graphics/xournal {