From efa29d89da6609fe4fa41380605b58e918b9489f Mon Sep 17 00:00:00 2001 From: Milka Kuzminski Date: Thu, 11 Mar 2021 22:34:32 +0100 Subject: [PATCH] build: fix rhodecode-tools for docker builds --- pkgs/patches/rhodecode_tools/setuptools.patch | 12 ++++++++++++ pkgs/python-packages-overrides.nix | 6 ++++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/patches/rhodecode_tools/setuptools.patch diff --git a/pkgs/patches/rhodecode_tools/setuptools.patch b/pkgs/patches/rhodecode_tools/setuptools.patch new file mode 100644 index 00000000..5cb09ff1 --- /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 index 01a1e1e1..947c78e4 100644 --- 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;