* [PR PATCH] python3-nacl: remove as deduplicate of python3-pynacl
@ 2020-07-28 20:06 Chocimier
2020-07-28 20:21 ` [PR PATCH] [Updated] " Chocimier
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Chocimier @ 2020-07-28 20:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 351 bytes --]
There is a new pull request by Chocimier against master on the void-packages repository
https://github.com/Chocimier/void-packages-org python3-nacl
https://github.com/void-linux/void-packages/pull/23912
python3-nacl: remove as deduplicate of python3-pynacl
A patch file from https://github.com/void-linux/void-packages/pull/23912.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python3-nacl-23912.patch --]
[-- Type: text/x-diff, Size: 6155 bytes --]
From de2e2d2ee2c680d4c74af9205c17b3140bf7d40a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 28 Jul 2020 22:04:35 +0200
Subject: [PATCH 1/4] python3-macaroons: switch from python3-nacl to
python3-pynacl
---
srcpkgs/python3-macaroons/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-macaroons/template b/srcpkgs/python3-macaroons/template
index 420f5aff043..a27b84911a3 100644
--- a/srcpkgs/python3-macaroons/template
+++ b/srcpkgs/python3-macaroons/template
@@ -1,13 +1,13 @@
# Template file for 'python3-macaroons'
pkgname=python3-macaroons
version=0.13.0
-revision=2
+revision=3
archs=noarch
wrksrc="pymacaroons-${version}"
build_style=python3-module
pycompile_module="pymacaroons"
hostmakedepends="python3-setuptools"
-depends="python3-six>=1.8.0 python3-nacl>=1.1.2 python3-nacl<2.0"
+depends="python3-six python3-pynacl"
short_desc="Python3 Macaroon library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
From d56938e859c8b3490793f3c3edfea36757099c68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 28 Jul 2020 22:04:35 +0200
Subject: [PATCH 2/4] python3-signedjson: switch from python3-nacl to
python3-pynacl
---
srcpkgs/python3-signedjson/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-signedjson/template b/srcpkgs/python3-signedjson/template
index 389d2903612..5002ade8f79 100644
--- a/srcpkgs/python3-signedjson/template
+++ b/srcpkgs/python3-signedjson/template
@@ -1,13 +1,13 @@
# Template file for 'python3-signedjson'
pkgname=python3-signedjson
version=1.1.0
-revision=1
+revision=2
archs=noarch
wrksrc="python-signedjson-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-canonicaljson>=1.0.0 python3-unpaddedbase64>=1.0.1
- python3-nacl>=0.3.0"
+ python3-pynacl"
short_desc="Sign JSON with Ed25519 signatures"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
From 03b1dbdf7b683ad75abd2f93a509ddd9b2e9bbbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 28 Jul 2020 22:04:35 +0200
Subject: [PATCH 3/4] synapse: switch from python3-nacl to python3-pynacl
---
srcpkgs/synapse/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index bb5fcd0d95d..e47fc074253 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,12 +1,12 @@
# Template file for 'synapse'
pkgname=synapse
version=1.17.0
-revision=1
+revision=2
archs=noarch
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-jsonschema python3-frozendict python3-canonicaljson
- python3-signedjson python3-nacl python3-service_identity python3-Twisted
+ python3-signedjson python3-pynacl python3-service_identity python3-Twisted
python3-openssl python3-yaml python3-pyasn1 python3-pyasn1-modules
python3-daemonize python3-bcrypt python3-Pillow python3-psutil
python3-msgpack python3-phonenumbers python3-prometheus_client<0.8.0
From cc73f127e9953bfefd5b6039945789118e54342b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 28 Jul 2020 22:04:35 +0200
Subject: [PATCH 4/4] python3-nacl: remove as deduplicate of python3-pynacl
---
srcpkgs/python-pynacl/template | 11 ++++++++---
srcpkgs/python3-nacl | 1 +
srcpkgs/python3-nacl/template | 24 ------------------------
3 files changed, 9 insertions(+), 27 deletions(-)
create mode 120000 srcpkgs/python3-nacl
delete mode 100644 srcpkgs/python3-nacl/template
diff --git a/srcpkgs/python-pynacl/template b/srcpkgs/python-pynacl/template
index 7a7fe246821..7ab0136ce69 100644
--- a/srcpkgs/python-pynacl/template
+++ b/srcpkgs/python-pynacl/template
@@ -1,13 +1,13 @@
# Template file for 'python-pynacl'
pkgname=python-pynacl
version=1.3.0
-revision=2
+revision=4
wrksrc="PyNaCl-${version}"
build_style=python-module
-pycompile_module="nacl"
hostmakedepends="python-setuptools python3-setuptools python-cffi python3-cffi"
makedepends="python-devel python3-devel python-cffi python3-cffi libsodium-devel"
depends="python-cffi python-six"
+checkdepends="${depends} python-hypothesis python-more-itertools python-parsing"
short_desc="Python2 binding to the Networking and Cryptography (NaCl) library"
maintainer="Alessio Sergi <al3hex@gmail.com>"
homepage="https://github.com/pyca/pynacl/"
@@ -18,10 +18,15 @@ checksum=0c6100edd16fefd1557da078c7a31e7b7d7a52ce39fdca2bec29d4f7b6e7600c
export SODIUM_INSTALL=system
python3-pynacl_package() {
- pycompile_module="nacl"
depends="python3-cffi python3-six"
short_desc="${short_desc/Python2/Python3}"
pkg_install() {
vmove usr/lib/python3*
}
}
+
+python3-nacl_package() {
+ build_style=meta
+ depends="python3-pynacl"
+ short_desc="${short_desc/Python2/Python3} - dummy transitional package"
+}
diff --git a/srcpkgs/python3-nacl b/srcpkgs/python3-nacl
new file mode 120000
index 00000000000..5738ec6f9cf
--- /dev/null
+++ b/srcpkgs/python3-nacl
@@ -0,0 +1 @@
+python-pynacl
\ No newline at end of file
diff --git a/srcpkgs/python3-nacl/template b/srcpkgs/python3-nacl/template
deleted file mode 100644
index cfbb29e03db..00000000000
--- a/srcpkgs/python3-nacl/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python3-nacl'
-pkgname=python3-nacl
-version=1.3.0
-revision=3
-wrksrc="PyNaCl-${version}"
-build_style=python3-module
-pycompile_module="nacl"
-hostmakedepends="python3-setuptools python3-pycparser python3-cffi"
-makedepends="libsodium-devel python3-devel libffi-devel"
-depends="python3-six python3-cffi"
-short_desc="Python3 bindings for the NaCl library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://github.com/pyca/pynacl/"
-distfiles="${PYPI_SITE}/P/PyNaCl/PyNaCl-${version}.tar.gz"
-checksum=0c6100edd16fefd1557da078c7a31e7b7d7a52ce39fdca2bec29d4f7b6e7600c
-
-pre_build() {
- export SODIUM_INSTALL=system
-}
-
-pre_install() {
- export SODIUM_INSTALL=system
-}
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] python3-nacl: remove as deduplicate of python3-pynacl
2020-07-28 20:06 [PR PATCH] python3-nacl: remove as deduplicate of python3-pynacl Chocimier
@ 2020-07-28 20:21 ` Chocimier
2020-08-03 19:43 ` Chocimier
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Chocimier @ 2020-07-28 20:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 356 bytes --]
There is an updated pull request by Chocimier against master on the void-packages repository
https://github.com/Chocimier/void-packages-org python3-nacl
https://github.com/void-linux/void-packages/pull/23912
python3-nacl: remove as deduplicate of python3-pynacl
A patch file from https://github.com/void-linux/void-packages/pull/23912.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python3-nacl-23912.patch --]
[-- Type: text/x-diff, Size: 6268 bytes --]
From 03491b0534a4477d0bacf3e1167f2fc3255c7a58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 28 Jul 2020 22:04:35 +0200
Subject: [PATCH 1/4] python3-macaroons: switch from python3-nacl to
python3-pynacl
---
srcpkgs/python3-macaroons/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-macaroons/template b/srcpkgs/python3-macaroons/template
index 420f5aff043..7dfb4f3f588 100644
--- a/srcpkgs/python3-macaroons/template
+++ b/srcpkgs/python3-macaroons/template
@@ -1,13 +1,12 @@
# Template file for 'python3-macaroons'
pkgname=python3-macaroons
version=0.13.0
-revision=2
+revision=3
archs=noarch
wrksrc="pymacaroons-${version}"
build_style=python3-module
-pycompile_module="pymacaroons"
hostmakedepends="python3-setuptools"
-depends="python3-six>=1.8.0 python3-nacl>=1.1.2 python3-nacl<2.0"
+depends="python3-six python3-pynacl"
short_desc="Python3 Macaroon library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
From 0f101f876d09102bdd0279a7906efe437a03dcc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 28 Jul 2020 22:04:35 +0200
Subject: [PATCH 2/4] python3-signedjson: switch from python3-nacl to
python3-pynacl
---
srcpkgs/python3-signedjson/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-signedjson/template b/srcpkgs/python3-signedjson/template
index 389d2903612..5002ade8f79 100644
--- a/srcpkgs/python3-signedjson/template
+++ b/srcpkgs/python3-signedjson/template
@@ -1,13 +1,13 @@
# Template file for 'python3-signedjson'
pkgname=python3-signedjson
version=1.1.0
-revision=1
+revision=2
archs=noarch
wrksrc="python-signedjson-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-canonicaljson>=1.0.0 python3-unpaddedbase64>=1.0.1
- python3-nacl>=0.3.0"
+ python3-pynacl"
short_desc="Sign JSON with Ed25519 signatures"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
From e567b062afcf87a2e9435a3e0c3a984e9ba33e93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 28 Jul 2020 22:04:35 +0200
Subject: [PATCH 3/4] synapse: switch from python3-nacl to python3-pynacl
---
srcpkgs/synapse/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index bb5fcd0d95d..e47fc074253 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,12 +1,12 @@
# Template file for 'synapse'
pkgname=synapse
version=1.17.0
-revision=1
+revision=2
archs=noarch
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-jsonschema python3-frozendict python3-canonicaljson
- python3-signedjson python3-nacl python3-service_identity python3-Twisted
+ python3-signedjson python3-pynacl python3-service_identity python3-Twisted
python3-openssl python3-yaml python3-pyasn1 python3-pyasn1-modules
python3-daemonize python3-bcrypt python3-Pillow python3-psutil
python3-msgpack python3-phonenumbers python3-prometheus_client<0.8.0
From 89a0c1683d4ccb03f98fed927e0d455df93ea777 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 28 Jul 2020 22:04:35 +0200
Subject: [PATCH 4/4] python3-nacl: remove as deduplicate of python3-pynacl
---
srcpkgs/python-pynacl/template | 13 +++++++++----
srcpkgs/python3-nacl | 1 +
srcpkgs/python3-nacl/template | 24 ------------------------
3 files changed, 10 insertions(+), 28 deletions(-)
create mode 120000 srcpkgs/python3-nacl
delete mode 100644 srcpkgs/python3-nacl/template
diff --git a/srcpkgs/python-pynacl/template b/srcpkgs/python-pynacl/template
index 7a7fe246821..6de29f2459f 100644
--- a/srcpkgs/python-pynacl/template
+++ b/srcpkgs/python-pynacl/template
@@ -1,27 +1,32 @@
# Template file for 'python-pynacl'
pkgname=python-pynacl
version=1.3.0
-revision=2
+revision=4
wrksrc="PyNaCl-${version}"
build_style=python-module
-pycompile_module="nacl"
hostmakedepends="python-setuptools python3-setuptools python-cffi python3-cffi"
makedepends="python-devel python3-devel python-cffi python3-cffi libsodium-devel"
depends="python-cffi python-six"
+checkdepends="${depends} python-hypothesis python-more-itertools python-parsing"
short_desc="Python2 binding to the Networking and Cryptography (NaCl) library"
maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/pyca/pynacl/"
license="Apache-2.0"
+homepage="https://github.com/pyca/pynacl/"
distfiles="${PYPI_SITE}/P/PyNaCl/PyNaCl-${version}.tar.gz"
checksum=0c6100edd16fefd1557da078c7a31e7b7d7a52ce39fdca2bec29d4f7b6e7600c
export SODIUM_INSTALL=system
python3-pynacl_package() {
- pycompile_module="nacl"
depends="python3-cffi python3-six"
short_desc="${short_desc/Python2/Python3}"
pkg_install() {
vmove usr/lib/python3*
}
}
+
+python3-nacl_package() {
+ build_style=meta
+ depends="python3-pynacl"
+ short_desc="${short_desc/Python2/Python3} - dummy transitional package"
+}
diff --git a/srcpkgs/python3-nacl b/srcpkgs/python3-nacl
new file mode 120000
index 00000000000..5738ec6f9cf
--- /dev/null
+++ b/srcpkgs/python3-nacl
@@ -0,0 +1 @@
+python-pynacl
\ No newline at end of file
diff --git a/srcpkgs/python3-nacl/template b/srcpkgs/python3-nacl/template
deleted file mode 100644
index cfbb29e03db..00000000000
--- a/srcpkgs/python3-nacl/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python3-nacl'
-pkgname=python3-nacl
-version=1.3.0
-revision=3
-wrksrc="PyNaCl-${version}"
-build_style=python3-module
-pycompile_module="nacl"
-hostmakedepends="python3-setuptools python3-pycparser python3-cffi"
-makedepends="libsodium-devel python3-devel libffi-devel"
-depends="python3-six python3-cffi"
-short_desc="Python3 bindings for the NaCl library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://github.com/pyca/pynacl/"
-distfiles="${PYPI_SITE}/P/PyNaCl/PyNaCl-${version}.tar.gz"
-checksum=0c6100edd16fefd1557da078c7a31e7b7d7a52ce39fdca2bec29d4f7b6e7600c
-
-pre_build() {
- export SODIUM_INSTALL=system
-}
-
-pre_install() {
- export SODIUM_INSTALL=system
-}
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] python3-nacl: remove as deduplicate of python3-pynacl
2020-07-28 20:06 [PR PATCH] python3-nacl: remove as deduplicate of python3-pynacl Chocimier
2020-07-28 20:21 ` [PR PATCH] [Updated] " Chocimier
@ 2020-08-03 19:43 ` Chocimier
2020-08-03 19:43 ` Chocimier
2020-08-03 19:43 ` [PR PATCH] [Merged]: " Chocimier
3 siblings, 0 replies; 5+ messages in thread
From: Chocimier @ 2020-08-03 19:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 356 bytes --]
There is an updated pull request by Chocimier against master on the void-packages repository
https://github.com/Chocimier/void-packages-org python3-nacl
https://github.com/void-linux/void-packages/pull/23912
python3-nacl: remove as deduplicate of python3-pynacl
A patch file from https://github.com/void-linux/void-packages/pull/23912.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python3-nacl-23912.patch --]
[-- Type: text/x-diff, Size: 6268 bytes --]
From e6389747b803b7e6310de6d6c46df7a888552043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 28 Jul 2020 22:04:35 +0200
Subject: [PATCH 1/4] python3-macaroons: switch from python3-nacl to
python3-pynacl
---
srcpkgs/python3-macaroons/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-macaroons/template b/srcpkgs/python3-macaroons/template
index 420f5aff043..7dfb4f3f588 100644
--- a/srcpkgs/python3-macaroons/template
+++ b/srcpkgs/python3-macaroons/template
@@ -1,13 +1,12 @@
# Template file for 'python3-macaroons'
pkgname=python3-macaroons
version=0.13.0
-revision=2
+revision=3
archs=noarch
wrksrc="pymacaroons-${version}"
build_style=python3-module
-pycompile_module="pymacaroons"
hostmakedepends="python3-setuptools"
-depends="python3-six>=1.8.0 python3-nacl>=1.1.2 python3-nacl<2.0"
+depends="python3-six python3-pynacl"
short_desc="Python3 Macaroon library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
From 44a6cbf59a9467cb0083248390e85edeee6550b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 28 Jul 2020 22:04:35 +0200
Subject: [PATCH 2/4] python3-signedjson: switch from python3-nacl to
python3-pynacl
---
srcpkgs/python3-signedjson/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-signedjson/template b/srcpkgs/python3-signedjson/template
index 389d2903612..5002ade8f79 100644
--- a/srcpkgs/python3-signedjson/template
+++ b/srcpkgs/python3-signedjson/template
@@ -1,13 +1,13 @@
# Template file for 'python3-signedjson'
pkgname=python3-signedjson
version=1.1.0
-revision=1
+revision=2
archs=noarch
wrksrc="python-signedjson-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-canonicaljson>=1.0.0 python3-unpaddedbase64>=1.0.1
- python3-nacl>=0.3.0"
+ python3-pynacl"
short_desc="Sign JSON with Ed25519 signatures"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
From 17ebb410b3d4006e95640f387e08081450a4e98f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 28 Jul 2020 22:04:35 +0200
Subject: [PATCH 3/4] synapse: switch from python3-nacl to python3-pynacl
---
srcpkgs/synapse/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index bb5fcd0d95d..e47fc074253 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,12 +1,12 @@
# Template file for 'synapse'
pkgname=synapse
version=1.17.0
-revision=1
+revision=2
archs=noarch
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-jsonschema python3-frozendict python3-canonicaljson
- python3-signedjson python3-nacl python3-service_identity python3-Twisted
+ python3-signedjson python3-pynacl python3-service_identity python3-Twisted
python3-openssl python3-yaml python3-pyasn1 python3-pyasn1-modules
python3-daemonize python3-bcrypt python3-Pillow python3-psutil
python3-msgpack python3-phonenumbers python3-prometheus_client<0.8.0
From 41ef4e609d75fa53712f3cea9340d1ae3f51d0e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 28 Jul 2020 22:04:35 +0200
Subject: [PATCH 4/4] python3-nacl: remove as deduplicate of python3-pynacl
---
srcpkgs/python-pynacl/template | 13 +++++++++----
srcpkgs/python3-nacl | 1 +
srcpkgs/python3-nacl/template | 24 ------------------------
3 files changed, 10 insertions(+), 28 deletions(-)
create mode 120000 srcpkgs/python3-nacl
delete mode 100644 srcpkgs/python3-nacl/template
diff --git a/srcpkgs/python-pynacl/template b/srcpkgs/python-pynacl/template
index 7a7fe246821..6de29f2459f 100644
--- a/srcpkgs/python-pynacl/template
+++ b/srcpkgs/python-pynacl/template
@@ -1,27 +1,32 @@
# Template file for 'python-pynacl'
pkgname=python-pynacl
version=1.3.0
-revision=2
+revision=4
wrksrc="PyNaCl-${version}"
build_style=python-module
-pycompile_module="nacl"
hostmakedepends="python-setuptools python3-setuptools python-cffi python3-cffi"
makedepends="python-devel python3-devel python-cffi python3-cffi libsodium-devel"
depends="python-cffi python-six"
+checkdepends="${depends} python-hypothesis python-more-itertools python-parsing"
short_desc="Python2 binding to the Networking and Cryptography (NaCl) library"
maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/pyca/pynacl/"
license="Apache-2.0"
+homepage="https://github.com/pyca/pynacl/"
distfiles="${PYPI_SITE}/P/PyNaCl/PyNaCl-${version}.tar.gz"
checksum=0c6100edd16fefd1557da078c7a31e7b7d7a52ce39fdca2bec29d4f7b6e7600c
export SODIUM_INSTALL=system
python3-pynacl_package() {
- pycompile_module="nacl"
depends="python3-cffi python3-six"
short_desc="${short_desc/Python2/Python3}"
pkg_install() {
vmove usr/lib/python3*
}
}
+
+python3-nacl_package() {
+ build_style=meta
+ depends="python3-pynacl"
+ short_desc="${short_desc/Python2/Python3} - dummy transitional package"
+}
diff --git a/srcpkgs/python3-nacl b/srcpkgs/python3-nacl
new file mode 120000
index 00000000000..5738ec6f9cf
--- /dev/null
+++ b/srcpkgs/python3-nacl
@@ -0,0 +1 @@
+python-pynacl
\ No newline at end of file
diff --git a/srcpkgs/python3-nacl/template b/srcpkgs/python3-nacl/template
deleted file mode 100644
index cfbb29e03db..00000000000
--- a/srcpkgs/python3-nacl/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python3-nacl'
-pkgname=python3-nacl
-version=1.3.0
-revision=3
-wrksrc="PyNaCl-${version}"
-build_style=python3-module
-pycompile_module="nacl"
-hostmakedepends="python3-setuptools python3-pycparser python3-cffi"
-makedepends="libsodium-devel python3-devel libffi-devel"
-depends="python3-six python3-cffi"
-short_desc="Python3 bindings for the NaCl library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://github.com/pyca/pynacl/"
-distfiles="${PYPI_SITE}/P/PyNaCl/PyNaCl-${version}.tar.gz"
-checksum=0c6100edd16fefd1557da078c7a31e7b7d7a52ce39fdca2bec29d4f7b6e7600c
-
-pre_build() {
- export SODIUM_INSTALL=system
-}
-
-pre_install() {
- export SODIUM_INSTALL=system
-}
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] python3-nacl: remove as deduplicate of python3-pynacl
2020-07-28 20:06 [PR PATCH] python3-nacl: remove as deduplicate of python3-pynacl Chocimier
2020-07-28 20:21 ` [PR PATCH] [Updated] " Chocimier
2020-08-03 19:43 ` Chocimier
@ 2020-08-03 19:43 ` Chocimier
2020-08-03 19:43 ` [PR PATCH] [Merged]: " Chocimier
3 siblings, 0 replies; 5+ messages in thread
From: Chocimier @ 2020-08-03 19:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 356 bytes --]
There is an updated pull request by Chocimier against master on the void-packages repository
https://github.com/Chocimier/void-packages-org python3-nacl
https://github.com/void-linux/void-packages/pull/23912
python3-nacl: remove as deduplicate of python3-pynacl
A patch file from https://github.com/void-linux/void-packages/pull/23912.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python3-nacl-23912.patch --]
[-- Type: text/x-diff, Size: 6266 bytes --]
From e6389747b803b7e6310de6d6c46df7a888552043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 28 Jul 2020 22:04:35 +0200
Subject: [PATCH 1/4] python3-macaroons: switch from python3-nacl to
python3-pynacl
---
srcpkgs/python3-macaroons/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-macaroons/template b/srcpkgs/python3-macaroons/template
index 420f5aff043..7dfb4f3f588 100644
--- a/srcpkgs/python3-macaroons/template
+++ b/srcpkgs/python3-macaroons/template
@@ -1,13 +1,12 @@
# Template file for 'python3-macaroons'
pkgname=python3-macaroons
version=0.13.0
-revision=2
+revision=3
archs=noarch
wrksrc="pymacaroons-${version}"
build_style=python3-module
-pycompile_module="pymacaroons"
hostmakedepends="python3-setuptools"
-depends="python3-six>=1.8.0 python3-nacl>=1.1.2 python3-nacl<2.0"
+depends="python3-six python3-pynacl"
short_desc="Python3 Macaroon library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
From 44a6cbf59a9467cb0083248390e85edeee6550b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 28 Jul 2020 22:04:35 +0200
Subject: [PATCH 2/4] python3-signedjson: switch from python3-nacl to
python3-pynacl
---
srcpkgs/python3-signedjson/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-signedjson/template b/srcpkgs/python3-signedjson/template
index 389d2903612..5002ade8f79 100644
--- a/srcpkgs/python3-signedjson/template
+++ b/srcpkgs/python3-signedjson/template
@@ -1,13 +1,13 @@
# Template file for 'python3-signedjson'
pkgname=python3-signedjson
version=1.1.0
-revision=1
+revision=2
archs=noarch
wrksrc="python-signedjson-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-canonicaljson>=1.0.0 python3-unpaddedbase64>=1.0.1
- python3-nacl>=0.3.0"
+ python3-pynacl"
short_desc="Sign JSON with Ed25519 signatures"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
From 17ebb410b3d4006e95640f387e08081450a4e98f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 28 Jul 2020 22:04:35 +0200
Subject: [PATCH 3/4] synapse: switch from python3-nacl to python3-pynacl
---
srcpkgs/synapse/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index bb5fcd0d95d..e47fc074253 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,12 +1,12 @@
# Template file for 'synapse'
pkgname=synapse
version=1.17.0
-revision=1
+revision=2
archs=noarch
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-jsonschema python3-frozendict python3-canonicaljson
- python3-signedjson python3-nacl python3-service_identity python3-Twisted
+ python3-signedjson python3-pynacl python3-service_identity python3-Twisted
python3-openssl python3-yaml python3-pyasn1 python3-pyasn1-modules
python3-daemonize python3-bcrypt python3-Pillow python3-psutil
python3-msgpack python3-phonenumbers python3-prometheus_client<0.8.0
From a3e19bbc7b5dbdf0941aad4532371e172dc59ae2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 28 Jul 2020 22:04:35 +0200
Subject: [PATCH 4/4] python3-nacl: remove as duplicate of python3-pynacl
---
srcpkgs/python-pynacl/template | 13 +++++++++----
srcpkgs/python3-nacl | 1 +
srcpkgs/python3-nacl/template | 24 ------------------------
3 files changed, 10 insertions(+), 28 deletions(-)
create mode 120000 srcpkgs/python3-nacl
delete mode 100644 srcpkgs/python3-nacl/template
diff --git a/srcpkgs/python-pynacl/template b/srcpkgs/python-pynacl/template
index 7a7fe246821..6de29f2459f 100644
--- a/srcpkgs/python-pynacl/template
+++ b/srcpkgs/python-pynacl/template
@@ -1,27 +1,32 @@
# Template file for 'python-pynacl'
pkgname=python-pynacl
version=1.3.0
-revision=2
+revision=4
wrksrc="PyNaCl-${version}"
build_style=python-module
-pycompile_module="nacl"
hostmakedepends="python-setuptools python3-setuptools python-cffi python3-cffi"
makedepends="python-devel python3-devel python-cffi python3-cffi libsodium-devel"
depends="python-cffi python-six"
+checkdepends="${depends} python-hypothesis python-more-itertools python-parsing"
short_desc="Python2 binding to the Networking and Cryptography (NaCl) library"
maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/pyca/pynacl/"
license="Apache-2.0"
+homepage="https://github.com/pyca/pynacl/"
distfiles="${PYPI_SITE}/P/PyNaCl/PyNaCl-${version}.tar.gz"
checksum=0c6100edd16fefd1557da078c7a31e7b7d7a52ce39fdca2bec29d4f7b6e7600c
export SODIUM_INSTALL=system
python3-pynacl_package() {
- pycompile_module="nacl"
depends="python3-cffi python3-six"
short_desc="${short_desc/Python2/Python3}"
pkg_install() {
vmove usr/lib/python3*
}
}
+
+python3-nacl_package() {
+ build_style=meta
+ depends="python3-pynacl"
+ short_desc="${short_desc/Python2/Python3} - dummy transitional package"
+}
diff --git a/srcpkgs/python3-nacl b/srcpkgs/python3-nacl
new file mode 120000
index 00000000000..5738ec6f9cf
--- /dev/null
+++ b/srcpkgs/python3-nacl
@@ -0,0 +1 @@
+python-pynacl
\ No newline at end of file
diff --git a/srcpkgs/python3-nacl/template b/srcpkgs/python3-nacl/template
deleted file mode 100644
index cfbb29e03db..00000000000
--- a/srcpkgs/python3-nacl/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python3-nacl'
-pkgname=python3-nacl
-version=1.3.0
-revision=3
-wrksrc="PyNaCl-${version}"
-build_style=python3-module
-pycompile_module="nacl"
-hostmakedepends="python3-setuptools python3-pycparser python3-cffi"
-makedepends="libsodium-devel python3-devel libffi-devel"
-depends="python3-six python3-cffi"
-short_desc="Python3 bindings for the NaCl library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://github.com/pyca/pynacl/"
-distfiles="${PYPI_SITE}/P/PyNaCl/PyNaCl-${version}.tar.gz"
-checksum=0c6100edd16fefd1557da078c7a31e7b7d7a52ce39fdca2bec29d4f7b6e7600c
-
-pre_build() {
- export SODIUM_INSTALL=system
-}
-
-pre_install() {
- export SODIUM_INSTALL=system
-}
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Merged]: python3-nacl: remove as deduplicate of python3-pynacl
2020-07-28 20:06 [PR PATCH] python3-nacl: remove as deduplicate of python3-pynacl Chocimier
` (2 preceding siblings ...)
2020-08-03 19:43 ` Chocimier
@ 2020-08-03 19:43 ` Chocimier
3 siblings, 0 replies; 5+ messages in thread
From: Chocimier @ 2020-08-03 19:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 187 bytes --]
There's a merged pull request on the void-packages repository
python3-nacl: remove as deduplicate of python3-pynacl
https://github.com/void-linux/void-packages/pull/23912
Description:
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-08-03 19:43 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-28 20:06 [PR PATCH] python3-nacl: remove as deduplicate of python3-pynacl Chocimier
2020-07-28 20:21 ` [PR PATCH] [Updated] " Chocimier
2020-08-03 19:43 ` Chocimier
2020-08-03 19:43 ` Chocimier
2020-08-03 19:43 ` [PR PATCH] [Merged]: " Chocimier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).