From a4081ba66304e97953785b6334b9241276f88e97 Mon Sep 17 00:00:00 2001 From: Frank Steinborn Date: Sun, 25 Jul 2021 15:34:36 +0200 Subject: [PATCH] python3-rsistent: remove Recently python3-pyrsistent was added which is the same package and installs the same files. Keep the more recent one, fix dependencies and drop this. Fixes installation of synapse. --- srcpkgs/python3-eliot/template | 4 ++-- srcpkgs/python3-pyrsistent/template | 8 +++++++- srcpkgs/python3-rsistent | 1 + srcpkgs/python3-rsistent/template | 19 ------------------- 4 files changed, 10 insertions(+), 22 deletions(-) create mode 120000 srcpkgs/python3-rsistent delete mode 100644 srcpkgs/python3-rsistent/template diff --git a/srcpkgs/python3-eliot/template b/srcpkgs/python3-eliot/template index 0cbb23eb4184..04251bcc3123 100644 --- a/srcpkgs/python3-eliot/template +++ b/srcpkgs/python3-eliot/template @@ -1,11 +1,11 @@ # Template file for 'python3-eliot' pkgname=python3-eliot version=1.12.0 -revision=2 +revision=3 wrksrc="eliot-${version}" build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3-setuptools python3-six python3-zope.interface python3-rsistent +depends="python3-setuptools python3-six python3-zope.interface python3-pyrsistent python3-boltons" short_desc="Logging library that tells you why it happened" maintainer="Orphaned " diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template index 9bb7e54de304..c278114af2c8 100644 --- a/srcpkgs/python3-pyrsistent/template +++ b/srcpkgs/python3-pyrsistent/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyrsistent' pkgname=python3-pyrsistent version=0.17.3 -revision=1 +revision=2 wrksrc="pyrsistent-${version}" build_style=python3-module hostmakedepends="python3-setuptools python3-devel" @@ -17,3 +17,9 @@ checksum=2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e post_install() { vlicense LICENCE.mit LICENSE } + +python3-rsistent_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - transitional dummy package" + build_style=meta +} diff --git a/srcpkgs/python3-rsistent b/srcpkgs/python3-rsistent new file mode 120000 index 000000000000..5e610c2b86f9 --- /dev/null +++ b/srcpkgs/python3-rsistent @@ -0,0 +1 @@ +python3-pyrsistent \ No newline at end of file diff --git a/srcpkgs/python3-rsistent/template b/srcpkgs/python3-rsistent/template deleted file mode 100644 index 05a8ef1fe38f..000000000000 --- a/srcpkgs/python3-rsistent/template +++ /dev/null @@ -1,19 +0,0 @@ -# Template file for 'python3-rsistent' -pkgname=python3-rsistent -version=0.15.7 -revision=2 -wrksrc="pyrsistent-${version}" -build_style=python3-module -hostmakedepends="python3-setuptools" -makedepends="python3-devel" -depends="python3-six" -short_desc="Persistent/Functional/Immutable data structures" -maintainer="Orphaned " -license="MIT" -homepage="https://github.com/tobgu/pyrsistent/" -distfiles="${PYPI_SITE}/p/pyrsistent/pyrsistent-${version}.tar.gz" -checksum=cdc7b5e3ed77bed61270a47d35434a30617b9becdf2478af76ad2c6ade307280 - -post_intsall() { - vlicense LICENSE.mit -}