diff --git a/pkgs/development/python-modules/beniget/default.nix b/pkgs/development/python-modules/beniget/default.nix index 3e3e104a9062..b0dfc690841d 100644 --- a/pkgs/development/python-modules/beniget/default.nix +++ b/pkgs/development/python-modules/beniget/default.nix @@ -1,25 +1,36 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, gast, + pytestCheckHook, }: buildPythonPackage rec { pname = "beniget"; - version = "0.4.1"; - format = "setuptools"; + version = "0.4.2.post1"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "75554b3b8ad0553ce2f607627dad3d95c60c441189875b98e097528f8e23ac0c"; + src = fetchFromGitHub { + owner = "serge-sans-paille"; + repo = "beniget"; + rev = "refs/tags/${version}"; + hash = "sha256-rNMgCEkI6p9KtLSz/2jVJ9rPeJzxv5rT+Pu6OHM8z70="; }; - propagatedBuildInputs = [ gast ]; + build-system = [ setuptools ]; + + dependencies = [ gast ]; + + pythonImportsCheck = [ "beniget" ]; + + nativeCheckInputs = [ pytestCheckHook ]; meta = { description = "Extract semantic information about static Python code"; homepage = "https://github.com/serge-sans-paille/beniget"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/gast/default.nix b/pkgs/development/python-modules/gast/default.nix index e275cc3170c2..d62c2bc4cd41 100644 --- a/pkgs/development/python-modules/gast/default.nix +++ b/pkgs/development/python-modules/gast/default.nix @@ -5,22 +5,25 @@ fetchFromGitHub, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "gast"; - version = "0.5.3"; - format = "setuptools"; + version = "0.6.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "serge-sans-paille"; - repo = pname; - rev = version; - hash = "sha256-0y2bHT7YEfTvDxTm6yLl3GmnPUYEieoGEnwkzfA6mOg="; + repo = "gast"; + rev = "refs/tags/${version}"; + hash = "sha256-zrbxW8qWhCY6tObP+/WDReoCnlCpMEzQucX2inpRTL4="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ astunparse pytestCheckHook @@ -28,11 +31,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "gast" ]; - meta = with lib; { + meta = { description = "Compatibility layer between the AST of various Python versions"; homepage = "https://github.com/serge-sans-paille/gast/"; - license = licenses.bsd3; - maintainers = with maintainers; [ + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jyp cpcloud ]; diff --git a/pkgs/development/python-modules/pythran/default.nix b/pkgs/development/python-modules/pythran/default.nix index e99283bc49ae..e74a9d62b210 100644 --- a/pkgs/development/python-modules/pythran/default.nix +++ b/pkgs/development/python-modules/pythran/default.nix @@ -3,7 +3,7 @@ python, buildPythonPackage, fetchFromGitHub, - isPy3k, + fetchpatch2, substituteAll, # build-system @@ -31,11 +31,16 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "serge-sans-paille"; repo = "pythran"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-TpD8YZnnv48PKYrUqR0/qvJG1XRbcMBcrkcERh6Q4q0="; }; patches = [ + (fetchpatch2 { + name = "bump-gast-to-0.6.0.patch"; + url = "https://github.com/serge-sans-paille/pythran/commit/840a0e706ec39963aec6bcd1f118bf33177c20b4.patch"; + hash = "sha256-FHGXWuAX/Nmn6uEfQgAXfUxIdApDwSfHHtOStxyme/0="; + }) # Hardcode path to mp library (substituteAll { src = ./0001-hardcode-path-to-libgomp.patch; @@ -51,9 +56,9 @@ buildPythonPackage rec { ln -s '${lib.getDev xsimd}'/include/xsimd pythran/ ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ ply gast numpy @@ -73,9 +78,8 @@ buildPythonPackage rec { # Test suite is huge and has a circular dependency on scipy. doCheck = false; - disabled = !isPy3k; - meta = { + changelog = "https://github.com/serge-sans-paille/pythran/blob/${src.rev}/Changelog"; description = "Ahead of Time compiler for numeric kernels"; homepage = "https://github.com/serge-sans-paille/pythran"; license = lib.licenses.bsd3;