From b02e3765e7fcaabc5971af82e51221a065da062b Mon Sep 17 00:00:00 2001 From: Jussi Kuokkanen Date: Mon, 19 Jun 2023 15:18:07 +0300 Subject: hfst: init at 3.16.0 --- pkgs/development/python-modules/hfst/default.nix | 45 ++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/hfst/default.nix (limited to 'pkgs/development/python-modules') diff --git a/pkgs/development/python-modules/hfst/default.nix b/pkgs/development/python-modules/hfst/default.nix new file mode 100644 index 00000000000..b865c4c84d6 --- /dev/null +++ b/pkgs/development/python-modules/hfst/default.nix @@ -0,0 +1,45 @@ +{ lib +, pkgs +, stdenv +, buildPythonPackage +, foma +, icu +, swig +}: + +buildPythonPackage rec { + pname = "hfst"; + inherit (pkgs.hfst) version src; + + sourceRoot = "${src.name}/python"; + + postPatch = '' + # omorfi-python looks for 'hfst' Python package + sed -i 's/libhfst_swig/hfst/' setup.py; + ''; + + nativeBuildInputs = [ + swig + ]; + + buildInputs = [ + icu + pkgs.hfst + ]; + + setupPyBuildFlags = [ + "--inplace" + ]; + + # Find foma in Darwin tests + preCheck = lib.optionalString stdenv.isDarwin '' + export DYLD_LIBRARY_PATH="${foma}/lib" + ''; + + meta = with lib; { + description = "Python bindings for HFST"; + homepage = "https://github.com/hfst/hfst"; + license = licenses.gpl3; + maintainers = with maintainers; [ lurkki ]; + }; +} -- cgit 1.4.1 From 8d34b31b3179d45e107ec9cca99b0de9585eba76 Mon Sep 17 00:00:00 2001 From: Jussi Kuokkanen Date: Mon, 19 Jun 2023 15:33:16 +0300 Subject: omorfi: init at 0.9.9 --- pkgs/applications/misc/omorfi/default.nix | 95 ---------------------- pkgs/development/libraries/omorfi/default.nix | 81 ++++++++++++++++++ pkgs/development/python-modules/omorfi/default.nix | 32 ++++++++ .../python-modules/omorfi/importfix.patch | 76 +++++++++++++++++ pkgs/top-level/all-packages.nix | 10 +-- pkgs/top-level/python-packages.nix | 2 + 6 files changed, 196 insertions(+), 100 deletions(-) delete mode 100644 pkgs/applications/misc/omorfi/default.nix create mode 100644 pkgs/development/libraries/omorfi/default.nix create mode 100644 pkgs/development/python-modules/omorfi/default.nix create mode 100644 pkgs/development/python-modules/omorfi/importfix.patch (limited to 'pkgs/development/python-modules') diff --git a/pkgs/applications/misc/omorfi/default.nix b/pkgs/applications/misc/omorfi/default.nix deleted file mode 100644 index 3aafd95ba8a..00000000000 --- a/pkgs/applications/misc/omorfi/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ lib -, stdenv -, autoconf -, automake -, autoreconfHook -, cg3 -, fetchFromGitHub -, hfst -, hfst-ospell -, icu -, libtool -, libvoikko -, pkg-config -, python3 -, python3Packages -, zip -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "omorfi"; - version = "0.9.9"; - - src = fetchFromGitHub { - owner = "flammie"; - repo = "omorfi"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-UoqdwNWCNOPX6u1YBlnXUcB/fmcvcy/HXbYciVrMBOY="; - }; - - # Fix for omorfi-hyphenate.sh file not found error - postInstall = '' - ln -s $out/share/omorfi/{omorfi.hyphenate-rules.hfst,omorfi.hyphenate.hfst} - ''; - - nativeBuildInputs = [ - autoreconfHook - cg3 - makeWrapper - pkg-config - python3 - zip - python3.pkgs.wrapPython - ]; - ->>>>>>> 2ea2d99a91e (hfst changes):pkgs/development/libraries/omorfi/default.nix - buildInputs = [ - hfst - hfst-ospell - python3Packages.hfst-python - icu - ]; - nativeBuildInputs = [ - autoconf - automake - autoreconfHook - cg3 - libtool - pkg-config - python3 - libvoikko - zip - ]; - propagatedBuildInputs = [ - hfst - python3Packages.hfst - icu - ]; - - # Enable all features - configureFlags = [ - "--enable-labeled-segments" - "--enable-lemmatiser" - "--enable-segmenter" - "--enable-hyphenator" - ]; - - # Fix for omorfi-hyphenate.sh file not found error - postInstall = '' - mv $out/share/omorfi/omorfi.hyphenate-rules.hfst $out/share/omorfi/omorfi.hyphenate.hfst - ''; - - src = fetchFromGitHub { - owner = "flammie"; - repo = "omorfi"; - rev = "refs/tags/v${version}"; - hash = "sha256-UoqdwNWCNOPX6u1YBlnXUcB/fmcvcy/HXbYciVrMBOY="; - }; - - meta = with lib; { - description = "Analysis for Finnish text"; - homepage = "https://github.com/flammie/omorfi"; - license = licenses.gpl3; - maintainers = with maintainers; [ lurkki ]; - }; -}) diff --git a/pkgs/development/libraries/omorfi/default.nix b/pkgs/development/libraries/omorfi/default.nix new file mode 100644 index 00000000000..d6d0f1741d1 --- /dev/null +++ b/pkgs/development/libraries/omorfi/default.nix @@ -0,0 +1,81 @@ +{ lib +, stdenv +, autoreconfHook +, cg3 +, fetchFromGitHub +, hfst +, hfst-ospell +, icu +, libvoikko +, makeWrapper +, pkg-config +, python3 +, zip +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "omorfi"; + version = "0.9.9"; + + src = fetchFromGitHub { + owner = "flammie"; + repo = "omorfi"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-UoqdwNWCNOPX6u1YBlnXUcB/fmcvcy/HXbYciVrMBOY="; + }; + + # Fix for omorfi-hyphenate.sh file not found error + postInstall = '' + ln -s $out/share/omorfi/{omorfi.hyphenate-rules.hfst,omorfi.hyphenate.hfst} + ''; + + nativeBuildInputs = [ + autoreconfHook + cg3 + makeWrapper + pkg-config + python3 + zip + python3.pkgs.wrapPython + ]; + + buildInputs = [ + python3.pkgs.hfst + hfst-ospell + libvoikko + ]; + + # Supplied pkg-config file doesn't properly expose these + propagatedBuildInputs = [ + hfst + icu + ]; + + # Wrap shell scripts so they find the Python scripts + # omorfi.bash inexplicably fails when wrapped + preFixup = '' + wrapPythonProgramsIn "$out/bin" "$out ${python3.pkgs.hfst}" + for i in "$out/bin"/*.{sh,bash}; do + if [ $(basename "$i") != "omorfi.bash" ]; then + wrapProgram "$i" --prefix "PATH" : "$out/bin/" + fi + done + ''; + + # Enable all features + configureFlags = [ + "--enable-labeled-segments" + "--enable-lemmatiser" + "--enable-segmenter" + "--enable-hyphenator" + ]; + + meta = with lib; { + description = "Analysis for Finnish text"; + homepage = "https://github.com/flammie/omorfi"; + license = licenses.gpl3; + maintainers = with maintainers; [ lurkki ]; + # Darwin build fails due to hfst not being found + broken = stdenv.isDarwin; + }; +}) diff --git a/pkgs/development/python-modules/omorfi/default.nix b/pkgs/development/python-modules/omorfi/default.nix new file mode 100644 index 00000000000..6bbe964de73 --- /dev/null +++ b/pkgs/development/python-modules/omorfi/default.nix @@ -0,0 +1,32 @@ +{ buildPythonPackage +, pkgs +, lib +, stdenv +, hfst +}: + +buildPythonPackage rec { + pname = "omorfi"; + inherit (pkgs.omorfi) src version; + + sourceRoot = "${src.name}/src/python"; + + propagatedBuildInputs = [ + hfst + ]; + + # Fixes some improper import paths + patches = [ ./importfix.patch ]; + + # Apply patch relative to source/src + patchFlags = [ "-p3" ]; + + meta = with lib; { + description = "Python interface for Omorfi"; + homepage = "https://github.com/flammie/omorfi"; + license = licenses.gpl3; + maintainers = with maintainers; [ lurkki ]; + # Ofborg build error (hfst not found?) + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/development/python-modules/omorfi/importfix.patch b/pkgs/development/python-modules/omorfi/importfix.patch new file mode 100644 index 00000000000..67a54363c7b --- /dev/null +++ b/pkgs/development/python-modules/omorfi/importfix.patch @@ -0,0 +1,76 @@ +diff --git a/src/python/omorfi/entryguessing/gradation.py b/src/python/omorfi/entryguessing/gradation.py +index 7d3ed8cb..825d7ead 100755 +--- a/src/python/omorfi/entryguessing/gradation.py ++++ b/src/python/omorfi/entryguessing/gradation.py +@@ -17,8 +17,8 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see . + +-from .omorfi.error_logging import fail_guess_because +-from .omorfi.string_mangling import replace_rightmost, replace_rightmosts ++from omorfi.error_logging import fail_guess_because ++from omorfi.string_manglers import replace_rightmost, replace_rightmosts + + + def gradation_make_morphophonemes(wordmap): +diff --git a/src/python/omorfi/entryguessing/guess_new_class.py b/src/python/omorfi/entryguessing/guess_new_class.py +index 1884716b..3a781bfc 100755 +--- a/src/python/omorfi/entryguessing/guess_new_class.py ++++ b/src/python/omorfi/entryguessing/guess_new_class.py +@@ -17,8 +17,8 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see . + +-from .error_logging import fail_guess_because +-from .string_manglers import three_syllable ++from omorfi.error_logging import fail_guess_because ++from omorfi.string_manglers import three_syllable + + + def guess_new_class(wordmap): +diff --git a/src/python/omorfi/entryguessing/plurale_tantum.py b/src/python/omorfi/entryguessing/plurale_tantum.py +index a8af81fb..95fc4b7b 100755 +--- a/src/python/omorfi/entryguessing/plurale_tantum.py ++++ b/src/python/omorfi/entryguessing/plurale_tantum.py +@@ -17,8 +17,8 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see . + +-from .error_logging import fail_guess_because +-from .omorfi.string_manglers import replace_rightmost, replace_rightmosts ++from omorfi.error_logging import fail_guess_because ++from omorfi.string_manglers import replace_rightmost, replace_rightmosts + + + def plurale_tantum_get_singular_stem(wordmap): +diff --git a/src/python/omorfi/formats/experimental_xml_formatter.py b/src/python/omorfi/formats/experimental_xml_formatter.py +index abccbff5..11b0f518 100755 +--- a/src/python/omorfi/formats/experimental_xml_formatter.py ++++ b/src/python/omorfi/formats/experimental_xml_formatter.py +@@ -19,9 +19,9 @@ + + from xml.sax.saxutils import escape as xml_escape + +-from ftb3_formatter import Ftb3Formatter ++from .ftb3_formatter import Ftb3Formatter + +-from .settings import version_id_easter_egg ++from omorfi.settings import version_id_easter_egg + + + def make_xmlid(s): +diff --git a/src/python/omorfi/formats/lexc_formatter.py b/src/python/omorfi/formats/lexc_formatter.py +index 4ec616b7..b146129f 100755 +--- a/src/python/omorfi/formats/lexc_formatter.py ++++ b/src/python/omorfi/formats/lexc_formatter.py +@@ -19,8 +19,8 @@ + + # functions for formatting the database data to lexc + +-from .settings import deriv_boundary, morph_boundary, newword_boundary, optional_hyphen, stub_boundary, word_boundary +-from .string_manglers import lexc_escape ++from omorfi.settings import deriv_boundary, morph_boundary, newword_boundary, optional_hyphen, stub_boundary, word_boundary ++from omorfi.string_manglers import lexc_escape + + + def format_copyright_lexc(): diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f40c9350352..53e82aa5d12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -41280,15 +41280,15 @@ with pkgs; charasay = callPackage ../tools/misc/charasay { }; - waylyrics = callPackage ../applications/audio/waylyrics { }; - - gitrs = callPackage ../tools/misc/gitrs { }; - libvoikko = callPackage ../development/libraries/libvoikko { }; hfst = callPackage ../development/libraries/hfst { }; - omorfi = callPackage ../applications/misc/omorfi { }; + omorfi = callPackage ../development/libraries/omorfi { }; hfst-ospell = callPackage ../development/libraries/hfst-ospell { }; + + waylyrics = callPackage ../applications/audio/waylyrics { }; + + gitrs = callPackage ../tools/misc/gitrs { }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 17339de0031..0ec5788a212 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7155,6 +7155,8 @@ self: super: with self; { omnilogic = callPackage ../development/python-modules/omnilogic { }; + omorfi = callPackage ../development/python-modules/omorfi { }; + omrdatasettools = callPackage ../development/python-modules/omrdatasettools { }; ondilo = callPackage ../development/python-modules/ondilo { }; -- cgit 1.4.1 From ef4360b98eef19e874c771f42291d2b8a687d5c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jul 2023 03:35:52 +0000 Subject: python310Packages.types-protobuf: 4.23.0.1 -> 4.23.0.2 --- pkgs/development/python-modules/types-protobuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/python-modules') diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix index 319082c8a64..8a169a2d9ce 100644 --- a/pkgs/development/python-modules/types-protobuf/default.nix +++ b/pkgs/development/python-modules/types-protobuf/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "4.23.0.1"; + version = "4.23.0.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-e9XqEioFexGoK3hdneRkkyoekXX+l3pBKK3vEdfzVUc="; + hash = "sha256-EGawadTw4Jveu2TKTzXMa4rM9S+Ag2gEbM7JZ0SvA3U="; }; propagatedBuildInputs = [ -- cgit 1.4.1 From 9770f6a23aadfe10b7072c014a7e3da43a106075 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 25 Jul 2023 13:14:22 +0200 Subject: python310Packages.trainer: 0.0.27 -> 0.0.29 https://github.com/coqui-ai/Trainer/releases/tag/v0.0.29 --- pkgs/development/python-modules/trainer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/python-modules') diff --git a/pkgs/development/python-modules/trainer/default.nix b/pkgs/development/python-modules/trainer/default.nix index ea4f0e265d7..43f147a6a9c 100644 --- a/pkgs/development/python-modules/trainer/default.nix +++ b/pkgs/development/python-modules/trainer/default.nix @@ -16,7 +16,7 @@ let pname = "trainer"; - version = "0.0.27"; + version = "0.0.29"; in buildPythonPackage { inherit pname version; @@ -26,7 +26,7 @@ buildPythonPackage { owner = "coqui-ai"; repo = "Trainer"; rev = "refs/tags/v${version}"; - hash = "sha256-2uITlcaGcRujhSZPK746d13X8ZrgaGbfMZruLmTpQIs="; + hash = "sha256-ISEIIJReYKT3tEAF9/pckPg2+aYkBJyRWo6fvWZ/asI="; }; postPatch = '' -- cgit 1.4.1