Switch back to upstream dh-virtualenv (#7621)

Upstream have merged our changes (spotify/dh-virtualenv#300), so let's switch back to it instead of using our fork.
matrix-org · Jun 3, 2020 · 2a8ed93 · 2a8ed93
1 parent 3820c24
commit 2a8ed93
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog.d/7621.misc b/changelog.d/7621.misc
@@ -0,0 +1 @@
+Switch to upstream `dh-virtualenv` rather than our fork for Debian package builds.
diff --git a/docker/Dockerfile-dhvirtualenv b/docker/Dockerfile-dhvirtualenv
@@ -28,7 +28,7 @@ RUN env DEBIAN_FRONTEND=noninteractive apt-get install \
 
 # fetch and unpack the package
 RUN mkdir /dh-virtualenv
-RUN wget -q -O /dh-virtualenv.tar.gz https://github.com/matrix-org/dh-virtualenv/archive/matrixorg-20200519.tar.gz
+RUN wget -q -O /dh-virtualenv.tar.gz https://github.com/spotify/dh-virtualenv/archive/ac6e1b1.tar.gz
 RUN tar -xv --strip-components=1 -C /dh-virtualenv -f /dh-virtualenv.tar.gz
 
 # install its build deps. We do another apt-cache-update here, because we might