From 8c7d490da6e39682fc46228feb6a8bd9733cddd4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt <hexa@darmstadt.ccc.de> Date: Thu, 14 Apr 2022 22:01:18 +0200 Subject: [PATCH] python3Packages.pyslurm: 19-05-0 -> 21.08.4 Unbreaks the package. --- .../python-modules/pyslurm/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index f25651dcf98b..248ccc41033b 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -1,17 +1,27 @@ -{ lib, fetchFromGitHub, buildPythonPackage, cython, slurm }: +{ lib +, pythonOlder +, fetchFromGitHub +, buildPythonPackage +, cython +, slurm +}: buildPythonPackage rec { pname = "pyslurm"; - version = "19-05-0"; + version = "21.08.4"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { repo = "pyslurm"; owner = "PySlurm"; - rev = version; - sha256 = "1lfb4q81y96syz5an1lzscfcvmfvlkf4cfl3i5zllw9r3gbarl2r"; + rev = "v${version}"; + hash = "sha256-9ZYTBO8g+5B9D8Ll5JjkJYFyh0RQNIjxg958UZoCNmA="; }; buildInputs = [ cython slurm ]; + setupPyBuildFlags = [ "--slurm-lib=${slurm}/lib" "--slurm-inc=${slurm.dev}/include" ]; # Test cases need /etc/slurm/slurm.conf and require a working slurm installation @@ -23,6 +33,5 @@ buildPythonPackage rec { license = licenses.gpl2; maintainers = with maintainers; [ bhipple ]; platforms = platforms.linux; - broken = true; # still needs slurm-19.05, but nixpkgs has slurm-20+ now }; }