From 056a0fb8fa453d94c443c16ae81fc5ba46b3ff48 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Jan 2022 14:15:33 +0000 Subject: [PATCH 1/2] python310Packages.somajo: 2.1.6 -> 2.2.0 --- pkgs/development/python-modules/somajo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index 8701fa98e67d..c832b2153fcf 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "SoMaJo"; - version = "2.1.6"; + version = "2.2.0"; disabled = !isPy3k; src = fetchFromGitHub { owner = "tsproisl"; repo = pname; rev = "v${version}"; - sha256 = "1q88x05729qdnl1gbahisjk3s97wha0b5dj3n63kq2qyvyy0929s"; + sha256 = "0ywdh1pfk0pgm64p97i9cwz0h9wggbp4shxp5l7kkqs2n2v5c6qg"; }; propagatedBuildInputs = [ regex ]; From 43a9b2ecc8c419a96999dbfafc538879a285595e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 23 Jan 2022 10:41:23 +0100 Subject: [PATCH 2/2] python3Packages.somajo: add pythonImportsCheck --- .../python-modules/somajo/default.nix | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index c832b2153fcf..e332d0defd73 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -1,22 +1,36 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonPackage, isPy3k, regex }: +{ lib +, stdenv +, fetchFromGitHub +, buildPythonPackage +, pythonOlder +, regex +}: buildPythonPackage rec { - pname = "SoMaJo"; + pname = "somajo"; version = "2.2.0"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "tsproisl"; - repo = pname; + repo = "SoMaJo"; rev = "v${version}"; sha256 = "0ywdh1pfk0pgm64p97i9cwz0h9wggbp4shxp5l7kkqs2n2v5c6qg"; }; - propagatedBuildInputs = [ regex ]; + propagatedBuildInputs = [ + regex + ]; # loops forever doCheck = !stdenv.isDarwin; + pythonImportsCheck = [ + "somajo" + ]; + meta = with lib; { description = "Tokenizer and sentence splitter for German and English web texts"; homepage = "https://github.com/tsproisl/SoMaJo";