diff options
| author | Erik Johnston <erik@matrix.org> | 2021-09-28 12:13:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-28 12:13:51 +0100 |
| commit | a8bbf085761095c49b04af1a08fc67b1a781617d (patch) | |
| tree | e8b5074b339594db2f307cbe99abd503aadd6c49 | |
| parent | Encode JSON responses on a thread in C, mk2 (#10905) (diff) | |
| download | synapse-a8bbf085761095c49b04af1a08fc67b1a781617d.tar.xz | |
Fix debian package builds. (#10931)
This was due to dh-virtualenv builds being broken due to Shpinx removing deprecated APIs.
| -rw-r--r-- | changelog.d/10931.bugfix | 1 | ||||
| -rw-r--r-- | docker/Dockerfile-dhvirtualenv | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/changelog.d/10931.bugfix b/changelog.d/10931.bugfix new file mode 100644 index 0000000000..3f30c9ccf1 --- /dev/null +++ b/changelog.d/10931.bugfix @@ -0,0 +1 @@ +Fix debian builds due to dh-virtualenv no longer being able to build their docs. diff --git a/docker/Dockerfile-dhvirtualenv b/docker/Dockerfile-dhvirtualenv index 017be8555e..1dd88140c7 100644 --- a/docker/Dockerfile-dhvirtualenv +++ b/docker/Dockerfile-dhvirtualenv @@ -47,8 +47,9 @@ RUN apt-get update -qq -o Acquire::Languages=none \ && cd /dh-virtualenv \ && env DEBIAN_FRONTEND=noninteractive mk-build-deps -ri -t "apt-get -y --no-install-recommends" -# build it -RUN cd /dh-virtualenv && dpkg-buildpackage -us -uc -b +# Build it. Note that building the docs doesn't work due to differences in +# Sphinx APIs across versions/distros. +RUN cd /dh-virtualenv && DEB_BUILD_OPTIONS=nodoc dpkg-buildpackage -us -uc -b ### ### Stage 1 |