diff --git a/pkgs/gemini/gmi2html/default.nix b/pkgs/gemini/gmi2html/default.nix

index 3c4332683379654fdb67d732d00a7fa78d2c2bd3..4e3f1eaa9de310521a1910002efdaeb47db0a6f0 100644

--- a/pkgs/gemini/gmi2html/default.nix

+++ b/pkgs/gemini/gmi2html/default.nix

@@ -2,13 +2,13 @@ { lib, stdenv, fetchFromGitHub, zig, scdoc, installShellFiles }:

stdenv.mkDerivation rec {

pname = "gmi2html";

• version = "2022-01-03";

• version = "0.4.1";

src = fetchFromGitHub {

 owner = "shtanton";

 repo = pname;

• rev = "2ee16d29c2ffd4057f2e89efb0d323ef79c70010";

• hash = "sha256-wlFj/zymZgG8vaY9yUs4NmV+CCMsjgchCyNDvgqZTLk=";

• rev = "v${version}";

• hash = "sha256-5m3erToDFkYOV1xoM+BLWbUOgP0A7TXthzQ0Sk1Qj+U=";

};

postPatch = ''

diff --git a/pkgs/linguistics/foma/default.nix b/pkgs/linguistics/foma/default.nix

index e698f7da139241b314df356e9678b58e959406e9..d1e19b060d78ee87e184f1e94b5de120a39de5e0 100644

--- a/pkgs/linguistics/foma/default.nix

+++ b/pkgs/linguistics/foma/default.nix

@@ -2,13 +2,13 @@ { lib, stdenv, fetchFromGitHub, bison, flex, libtool, ncurses, readline, zlib }:

stdenv.mkDerivation rec {

pname = "foma";

• version = "2021-06-04";

• version = "2022-02-26";

src = fetchFromGitHub {

 owner = "mhulden";

 repo = pname;

• rev = "180b6febf718af4b0223b6c7ac46f698a76e6a45";

• hash = "sha256-6pdd9yQ+o2uPwPWSFPUSpTk/UC/up8xv1SZY++hKPPk=";

• rev = "82f9acdef234eae8b7619ccc3a386cc0d7df62bc";

• hash = "sha256-2ZL7SdjFmf1zD+jRsg0XybyX7mRsqbWV1ZMhiQINwO0=";

};

sourceRoot = "${src.name}/foma";

diff --git a/pkgs/linguistics/hfst/default.nix b/pkgs/linguistics/hfst/default.nix

index 79530abdea6d8765bfef3e40a6fdb5c827639277..12019933eedbaa86ba75847ed3521f25aea17cfc 100644

--- a/pkgs/linguistics/hfst/default.nix

+++ b/pkgs/linguistics/hfst/default.nix

@@ -1,17 +1,26 @@

-{ lib, stdenv, fetchFromGitHub, autoreconfHook, bison, flex }:

+{ lib, stdenv, fetchFromGitHub, autoreconfHook

+, bison, flex, foma, pkg-config, icu, zlib }:

stdenv.mkDerivation rec {

pname = "hfst";

• version = "3.15.5";

• version = "3.16.0";

src = fetchFromGitHub {

 owner = "hfst";

 repo = pname;

 rev = "v${version}";

• hash = "sha256-BvcueEdu+4rTeazvZ08BtNHkvGBIZi6W1+Fn3tJMxac=";

• hash = "sha256-2ST0s08Pcp+hTn7rUTgPE1QkH6PPWtiuFezXV3QW0kU=";

};

• nativeBuildInputs = [ autoreconfHook bison flex ];

• nativeBuildInputs = [ autoreconfHook bison flex pkg-config ];

• buildInputs = [ foma icu zlib ];

• configureFlags = [

• "--with-foma-upstream=true"

• ];

• enableParallelBuilding = true;

meta = with lib; {

 description = "Helsinki Finite-State Technology (library and application suite)";

diff --git a/pkgs/linguistics/python-hfst/default.nix b/pkgs/linguistics/python-hfst/default.nix

index c53ecef2cdf6dbb1aab2ec7d05f24effcda7dd5e..231724ce128cc6e42598640bc3d2495752569c9c 100644

--- a/pkgs/linguistics/python-hfst/default.nix

+++ b/pkgs/linguistics/python-hfst/default.nix

@@ -1,4 +1,4 @@

-{ lib, python3Packages, hfst, swig }:

+{ lib, python3Packages, hfst, icu, swig }:

python3Packages.buildPythonPackage rec {

pname = "python-hfst";

@@ -6,7 +6,7 @@ inherit (hfst) src version;

sourceRoot = "${src.name}/python";

• buildInputs = [ hfst ];

• buildInputs = [ hfst icu ];

nativeBuildInputs = [ swig ];