# HG changeset patch # User Milka Kuzminski # Date 2021-03-11 21:34:32 # Node ID 9db216d5e579c1ce0518123cd7fdbfadb9eb6379 # Parent 5d2569e39910a3c9bf08f7dc633168bf964bc9f3 build: fix rhodecode-tools for docker builds diff --git a/pkgs/patches/rhodecode_tools/setuptools.patch b/pkgs/patches/rhodecode_tools/setuptools.patch new file mode 100644 --- /dev/null +++ b/pkgs/patches/rhodecode_tools/setuptools.patch @@ -0,0 +1,12 @@ +diff -rup rhodecode-tools-1.4.0-orig/setup.py rhodecode-tools-1.4.0/setup.py +--- rhodecode-tools-1.4.0/setup-orig.py 2021-03-11 12:34:45.000000000 +0100 ++++ rhodecode-tools-1.4.0/setup.py 2021-03-11 12:34:56.000000000 +0100 +@@ -69,7 +69,7 @@ def _get_requirements(req_filename, excl + + + # requirements extract +-setup_requirements = ['pytest-runner'] ++setup_requirements = ['pytest-runner==5.1.0'] + install_requirements = _get_requirements( + 'requirements.txt', exclude=['setuptools']) + test_requirements = _get_requirements('requirements_test.txt') \ No newline at end of file diff --git a/pkgs/python-packages-overrides.nix b/pkgs/python-packages-overrides.nix --- a/pkgs/python-packages-overrides.nix +++ b/pkgs/python-packages-overrides.nix @@ -292,6 +292,12 @@ self: super: { ]; }); + "rhodecode-tools" = super."rhodecode-tools".override (attrs: { + patches = [ + ./patches/rhodecode_tools/setuptools.patch + ]; + }); + # Avoid that base packages screw up the build process inherit (basePythonPackages) setuptools;