diff --git a/pkgs/by-name/ed/edlib/package.nix b/pkgs/by-name/ed/edlib/package.nix index 7042a92b8caf..9358ca49435c 100644 --- a/pkgs/by-name/ed/edlib/package.nix +++ b/pkgs/by-name/ed/edlib/package.nix @@ -5,15 +5,15 @@ cmake, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "edlib"; - version = "unstable-2021-08-20"; + version = "1.3.9.post1"; src = fetchFromGitHub { owner = "Martinsos"; repo = "edlib"; - rev = "f8afceb49ab0095c852e0b8b488ae2c88e566afd"; - hash = "sha256-P/tFbvPBtA0MYCNDabW+Ypo3ltwP4S+6lRDxwAZ1JFo="; + tag = finalAttrs.version; + hash = "sha256-XejxohLVdBBzpYZ//OpqC1ActmCaZ8tunJyhOYtZmKQ="; }; nativeBuildInputs = [ cmake ]; @@ -25,11 +25,11 @@ stdenv.mkDerivation { runHook postCheck ''; - meta = with lib; { + meta = { homepage = "https://martinsos.github.io/edlib"; description = "Lightweight, fast C/C++ library for sequence alignment using edit distance"; - maintainers = with maintainers; [ bcdarwin ]; - license = licenses.mit; - platforms = platforms.unix; + maintainers = with lib.maintainers; [ bcdarwin ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/development/python-modules/edlib/default.nix b/pkgs/development/python-modules/edlib/default.nix index 5a16cd6e023f..2a464b1565b3 100644 --- a/pkgs/development/python-modules/edlib/default.nix +++ b/pkgs/development/python-modules/edlib/default.nix @@ -4,14 +4,17 @@ edlib, cython, python, + setuptools, }: buildPythonPackage { - inherit (edlib) pname src meta; - version = "1.3.9"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; + inherit (edlib) + pname + src + version + meta + ; + pyproject = true; sourceRoot = "${edlib.src.name}/bindings/python"; @@ -19,10 +22,14 @@ buildPythonPackage { ln -s ${edlib.src}/edlib . ''; - EDLIB_OMIT_README_RST = 1; - EDLIB_USE_CYTHON = 1; + env.EDLIB_OMIT_README_RST = 1; + env.EDLIB_USE_CYTHON = 1; + + build-system = [ + setuptools + cython + ]; - nativeBuildInputs = [ cython ]; buildInputs = [ edlib ]; checkPhase = ''