summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Cao <nickcao@nichi.co>2023-01-21 14:46:02 +0800
committerGitHub <noreply@github.com>2023-01-21 14:46:02 +0800
commit04886b4f909f054844d4b7c8a3570c49d544c85e (patch)
tree2e986075b32ca8707cbc015f9cf441adc1ccad45
parentf7b2f2970d087f73993b86b615af0f8c08467f79 (diff)
parentc4604c8ed4897d0b6cbda95d9787a0cb0161b955 (diff)
Merge pull request #211637 from dotlambda/taskflow-3.5.0
taskflow: 3.4.0 -> 3.5.0
-rw-r--r--pkgs/development/libraries/taskflow/default.nix4
-rw-r--r--pkgs/development/python-modules/pytest-shutil/default.nix3
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/libraries/taskflow/default.nix b/pkgs/development/libraries/taskflow/default.nix
index dd2f8fb39144..cde327c550eb 100644
--- a/pkgs/development/libraries/taskflow/default.nix
+++ b/pkgs/development/libraries/taskflow/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "taskflow";
- version = "3.4.0";
+ version = "3.5.0";
src = fetchFromGitHub {
owner = "taskflow";
repo = "taskflow";
rev = "v${version}";
- hash = "sha256-5bTTV/WAxslHQ+hvATtUUA1h3MuNzwVTlYMbD/sINRM=";
+ hash = "sha256-UUWJENGn60YQdUSQ55uL+/3xt/JUsVuKnqm/ef7wPVM=";
};
patches = [
diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix
index 64b0ff0c1d0d..6316701787c2 100644
--- a/pkgs/development/python-modules/pytest-shutil/default.nix
+++ b/pkgs/development/python-modules/pytest-shutil/default.nix
@@ -11,7 +11,6 @@
, mock
, path
, execnet
-, contextlib2
, termcolor
, six
@@ -32,6 +31,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.py \
+ --replace "contextlib2" 'contextlib2;python_version<"3"' \
--replace "path.py" "path"
'';
@@ -44,7 +44,6 @@ buildPythonPackage rec {
mock
path
execnet
- contextlib2
termcolor
six
];