Always use v2-sdist

ghcjs · Mar 24, 2021 · ae8a754 · ae8a754
1 parent 6422178
commit ae8a754
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/utils/makePackages.sh b/utils/makePackages.sh
@@ -167,11 +167,13 @@ copy_patch_boot_package_sdist() {
   # collect the files of the upstream package by making a source distribution
   (
   cd "$PKGSRC"
-  rm -f "dist-install/$PKG-*.tar.gz"
-  cabal "${CMDPREFIX}sdist" --builddir=dist-install
+  rm -f "dist-install/sdist/$PKG-*.tar.gz"
+  echo 'packages: .' > cabal.project
+  cabal "v2-sdist" --builddir=dist-install
+  rm cabal.project
   )
   # unpack the source distribution
-  for SRCDISTTMP in $PKGSRC/dist-install/$PKG-*.tar.gz; do
+  for SRCDISTTMP in $PKGSRC/dist-install/sdist/$PKG-*.tar.gz; do
     SRCDIST="$SRCDISTTMP"
   done
   (