Date: Thu, 9 Mar 2023 19:49:55 GMT From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4caa2e2b27f1 - main - Mk/Uses: Drop the "/package/" part of URI when calling cabal2tuple. Message-ID: <202303091949.329JntgE044461@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=4caa2e2b27f1f5728591ccd9bba370791b7c8f28 commit 4caa2e2b27f1f5728591ccd9bba370791b7c8f28 Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2023-03-09 19:25:49 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2023-03-09 19:38:13 +0000 Mk/Uses: Drop the "/package/" part of URI when calling cabal2tuple. Some repositories unlike Hackage append "/package/" when accessing a package. This confuses cabal2tuple, so chop it. --- Mk/Uses/cabal.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk index 23d0b0fa6ebb..0dda929e7e57 100644 --- a/Mk/Uses/cabal.mk +++ b/Mk/Uses/cabal.mk @@ -173,7 +173,7 @@ EXTRACT_ONLY+= ${_CABAL_EXTRACT_ONLY} . if defined(CABAL_REPOSITORIES) && !empty(CABAL_REPOSITORIES) . for r in ${CABAL_REPOSITORIES} -CABAL2TUPLE_ARGS+= --group=${r} --master-site=${MASTER_SITES:M*\:${r}:[1]:S/:${r}//} +CABAL2TUPLE_ARGS+= --group=${r} --master-site=${MASTER_SITES:M*\:${r}:[1]:S/:${r}//:S|/package/||} . endfor . endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303091949.329JntgE044461>