diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-27 19:36:52 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-06-03 11:13:36 -0400 |
| commit | 3e96aebf4ed7176acb5e94e9dcf62b64b0c1cf22 (patch) | |
| tree | 721f9cc00fc54864d14e30b97b5e425b4a2236af /pkgs | |
| parent | be705d8249218b1583c345fa3ca467bfffbfa8b5 (diff) | |
| download | nixpkgs-3e96aebf4ed7176acb5e94e9dcf62b64b0c1cf22.tar nixpkgs-3e96aebf4ed7176acb5e94e9dcf62b64b0c1cf22.tar.gz nixpkgs-3e96aebf4ed7176acb5e94e9dcf62b64b0c1cf22.tar.bz2 nixpkgs-3e96aebf4ed7176acb5e94e9dcf62b64b0c1cf22.tar.lz nixpkgs-3e96aebf4ed7176acb5e94e9dcf62b64b0c1cf22.tar.xz nixpkgs-3e96aebf4ed7176acb5e94e9dcf62b64b0c1cf22.tar.zst nixpkgs-3e96aebf4ed7176acb5e94e9dcf62b64b0c1cf22.zip | |
enchant: 1.6.1 -> 2.2.3
Moves default enchant to 2.2.3. Release url: https://github.com/AbiWord/enchant/releases/tag/v2.0.0 Mostly need to verify no breakage occurs for packages using enchant.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/irc/hexchat/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/enchant/1.x.nix (renamed from pkgs/development/libraries/enchant/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/development/python-modules/pyenchant/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
4 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index f03e4c4e9e3..34c4fcf0c88 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, gtk2, lua, perl, python2 , libtool, pciutils, dbus-glib, libcanberra-gtk2, libproxy -, libsexy, enchant, libnotify, openssl, intltool +, libsexy, enchant1, libnotify, openssl, intltool , desktop-file-utils, hicolor-icon-theme , 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 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 = '' diff --git a/pkgs/development/libraries/enchant/default.nix b/pkgs/development/libraries/enchant/1.x.nix index b7303468cba..b7303468cba 100644 --- a/pkgs/development/libraries/enchant/default.nix +++ b/pkgs/development/libraries/enchant/1.x.nix diff --git a/pkgs/development/python-modules/pyenchant/default.nix b/pkgs/development/python-modules/pyenchant/default.nix index 40ac257cad1..8c240261463 100644 --- a/pkgs/development/python-modules/pyenchant/default.nix +++ b/pkgs/development/python-modules/pyenchant/default.nix @@ -13,10 +13,10 @@ buildPythonPackage rec { sha256 = "fc31cda72ace001da8fe5d42f11c26e514a91fa8c70468739216ddd8de64e2a0"; }; - propagatedBuildInputs = [ pkgs.enchant ]; + propagatedBuildInputs = [ pkgs.enchant1 ]; 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 '' sed -i "${path_hack_script}" enchant/_enchant.py diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3af78b9f552..63a906f97c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10201,9 +10201,10 @@ in 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 { }; + enchant = enchant2; enet = callPackage ../development/libraries/enet { }; |