From 666631787e2e4c23b439903cf7eff4b40bab528f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Oct 2022 10:02:35 +0000 Subject: [PATCH 1/2] python310Packages.batchspawner: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/batchspawner/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/batchspawner/default.nix b/pkgs/development/python-modules/batchspawner/default.nix index 2b7cd1b21ecc..ec659fdf6d75 100644 --- a/pkgs/development/python-modules/batchspawner/default.nix +++ b/pkgs/development/python-modules/batchspawner/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "batchspawner"; - version = "1.1.0"; + version = "1.2.0"; disabled = isPy27; src = fetchFromGitHub { owner = "jupyterhub"; repo = "batchspawner"; - rev = "v${version}"; - sha256 = "0zv485b7fk5zlwgp5fyibanqzbpisdl2a0gz70fwdj4kl462axnw"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-oyS47q+gsO7JmRsbVJXglZsSRfits5rS/nrHW5E7EV0="; }; propagatedBuildInputs = [ From 36d0c5fa77b6ff3ce229aad2cbc22c138f643fb4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Oct 2022 13:14:26 +0200 Subject: [PATCH 2/2] python310Packages.batchspawner: disable on older Python releases --- .../python-modules/batchspawner/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/batchspawner/default.nix b/pkgs/development/python-modules/batchspawner/default.nix index ec659fdf6d75..09023536a94b 100644 --- a/pkgs/development/python-modules/batchspawner/default.nix +++ b/pkgs/development/python-modules/batchspawner/default.nix @@ -2,29 +2,33 @@ , buildPythonPackage , fetchFromGitHub , jupyterhub -, isPy27 +, pythonOlder }: buildPythonPackage rec { pname = "batchspawner"; version = "1.2.0"; - disabled = isPy27; + format = "setuptools"; + + disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "jupyterhub"; repo = "batchspawner"; rev = "refs/tags/v${version}"; - sha256 = "sha256-oyS47q+gsO7JmRsbVJXglZsSRfits5rS/nrHW5E7EV0="; + hash = "sha256-oyS47q+gsO7JmRsbVJXglZsSRfits5rS/nrHW5E7EV0="; }; propagatedBuildInputs = [ jupyterhub ]; - # tests require a job scheduler e.g. slurm, pbs, etc. + # Tests require a job scheduler e.g. slurm, pbs, etc. doCheck = false; - pythonImportsCheck = [ "batchspawner" ]; + pythonImportsCheck = [ + "batchspawner" + ]; meta = with lib; { description = "A spawner for Jupyterhub to spawn notebooks using batch resource managers";