diff --git a/pkgs/development/python-modules/archspec/default.nix b/pkgs/development/python-modules/archspec/default.nix index d0f7e0ac67e3..3c9c0f00f7d7 100644 --- a/pkgs/development/python-modules/archspec/default.nix +++ b/pkgs/development/python-modules/archspec/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "archspec"; - version = "0.2.3"; + version = "0.2.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,12 +21,12 @@ buildPythonPackage rec { repo = "archspec"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-Ek+rmgvG6DbtxljAEHVac/JzNI1MaLpPu4G8nhaxzg8="; + hash = "sha256-Xg1XdmKk2b6fqzOdedU3SGIgy65CjExxDByt/Xvmr24="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ click ]; + dependecies = [ click ]; nativeCheckInputs = [ pytestCheckHook @@ -37,7 +37,6 @@ buildPythonPackage rec { meta = with lib; { description = "Library for detecting, labeling, and reasoning about microarchitectures"; - mainProgram = "archspec"; homepage = "https://archspec.readthedocs.io/"; changelog = "https://github.com/archspec/archspec/releases/tag/v${version}"; license = with licenses; [ @@ -45,5 +44,6 @@ buildPythonPackage rec { asl20 ]; maintainers = with maintainers; [ atila ]; + mainProgram = "archspec"; }; } diff --git a/pkgs/development/python-modules/hpccm/default.nix b/pkgs/development/python-modules/hpccm/default.nix index 2404e7a3888b..1ab5e163a0bc 100644 --- a/pkgs/development/python-modules/hpccm/default.nix +++ b/pkgs/development/python-modules/hpccm/default.nix @@ -1,29 +1,36 @@ { lib, - fetchFromGitHub, - buildPythonPackage, - six, archspec, - pytestCheckHook, + buildPythonPackage, + fetchFromGitHub, pytest-xdist, + pytestCheckHook, + pythonOlder, + setuptools, + six, }: buildPythonPackage rec { pname = "hpccm"; - version = "22.10.0"; - format = "setuptools"; + version = "23.11.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "hpc-container-maker"; - rev = "v${version}"; - hash = "sha256-dLMbwtvn7HTVVlWHAzXU19ERdJxytf9NlnqMXW6ShKI="; + rev = "refs/tags/v${version}"; + hash = "sha256-uB2+1Nc+SgPzB5hJI1L6yD8gn0hGOkIZF6rejq4rYg8="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ six archspec ]; + nativeCheckInputs = [ pytestCheckHook pytest-xdist @@ -39,10 +46,11 @@ buildPythonPackage rec { meta = with lib; { description = "HPC Container Maker"; - mainProgram = "hpccm"; homepage = "https://github.com/NVIDIA/hpc-container-maker"; + changelog = "https://github.com/NVIDIA/hpc-container-maker/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - platforms = platforms.x86; maintainers = with maintainers; [ atila ]; + mainProgram = "hpccm"; + platforms = platforms.x86; }; }