[-- Attachment #1: Type: text/plain, Size: 486 bytes --] There is a new pull request by AdamFrey against master on the void-packages repository https://github.com/AdamFrey/void-packages leiningen-2.10.0 https://github.com/void-linux/void-packages/pull/41825 leiningen: update to 2.10.0. #### Testing the changes - I tested the changes in this PR: **YES** #### Local build testing - I built this PR locally for my native architecture, (x86_64) A patch file from https://github.com/void-linux/void-packages/pull/41825.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-leiningen-2.10.0-41825.patch --] [-- Type: text/x-diff, Size: 2184 bytes --] From 67d0e111e0ee23a1ceca1d557ab96bb35eea9615 Mon Sep 17 00:00:00 2001 From: Adam Frey <adam@adamfrey.me> Date: Mon, 23 Jan 2023 15:14:37 -0500 Subject: [PATCH] leiningen: update to 2.10.0. --- srcpkgs/leiningen/template | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/srcpkgs/leiningen/template b/srcpkgs/leiningen/template index bed67800d0e5..100f0404ec7e 100644 --- a/srcpkgs/leiningen/template +++ b/srcpkgs/leiningen/template @@ -1,24 +1,28 @@ # Template file for 'leiningen' pkgname=leiningen -version=2.9.5 +version=2.10.0 revision=1 depends="bash virtual?java-runtime" short_desc="Automate Clojure projects without setting your hair on fire" -maintainer="Orphaned <orphan@voidlinux.org>" +maintainer="Adam Frey <adam@adamfrey.me>" license="EPL-2.0" homepage="http://leiningen.org/" -distfiles="https://github.com/technomancy/${pkgname}/archive/${version}.tar.gz - https://github.com/technomancy/${pkgname}/releases/download/${version}/leiningen-${version}-standalone.zip" -checksum="a29b45966e5cc1a37d5dc07fe436ed7cb172c88c53d44a049956ff53a096d43e - df490c98bfe8d667bc5d83b80238528877234c285d0d48f61a4c8743c2db1eea" -skip_extraction="leiningen-${version}-standalone.zip" +distfiles="https://codeberg.org/${pkgname}/${pkgname}/archive/${version}.tar.gz + https://codeberg.org/attachments/${jar_id}" +checksum="6b04dbe0934ab4c34dc27b0055ad290d2ba9c0f454c1bda7defa58d62946b743 + d27299bad34075ac2864d0bd0559f835c6e2c476c0b0a283bcbdb574fdadbb34" +_jar_id=43cebda5-a7c2-405b-b641-5143a00051b5 + +do_extract() { + bsdtar xf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${version}.tar.gz +} do_install() { - vbin bin/lein-pkg lein - vman doc/lein.1 + vbin ${pkgname}/bin/lein lein + vman ${pkgname}/doc/lein.1 - vinstall ${XBPS_SRCDISTDIR}/${pkgname}-${version}/leiningen-${version}-standalone.zip \ + vinstall ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_jar_id} \ 644 usr/share/java leiningen-${version}-standalone.jar - vcompletion zsh_completion.zsh zsh lein - vcompletion bash_completion.bash bash lein + vcompletion ${pkgname}/zsh_completion.zsh zsh lein + vcompletion ${pkgname}/bash_completion.bash bash lein }
[-- Attachment #1: Type: text/plain, Size: 174 bytes --] New review comment by paper42 on void-packages repository https://github.com/void-linux/void-packages/pull/41825#discussion_r1084527685 Comment: put jar_id after revision.
[-- Attachment #1: Type: text/plain, Size: 197 bytes --] New review comment by paper42 on void-packages repository https://github.com/void-linux/void-packages/pull/41825#discussion_r1084528534 Comment: why is this required? skip_extraction is not used
[-- Attachment #1: Type: text/plain, Size: 491 bytes --] There is an updated pull request by AdamFrey against master on the void-packages repository https://github.com/AdamFrey/void-packages leiningen-2.10.0 https://github.com/void-linux/void-packages/pull/41825 leiningen: update to 2.10.0. #### Testing the changes - I tested the changes in this PR: **YES** #### Local build testing - I built this PR locally for my native architecture, (x86_64) A patch file from https://github.com/void-linux/void-packages/pull/41825.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-leiningen-2.10.0-41825.patch --] [-- Type: text/x-diff, Size: 1937 bytes --] From aac814bfdaa78cf1a4585b4975a1c9cc4573aa1f Mon Sep 17 00:00:00 2001 From: Adam Frey <adam@adamfrey.me> Date: Mon, 23 Jan 2023 15:14:37 -0500 Subject: [PATCH] leiningen: update to 2.10.0. --- srcpkgs/leiningen/template | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/srcpkgs/leiningen/template b/srcpkgs/leiningen/template index bed67800d0e5..ab2007afc7e4 100644 --- a/srcpkgs/leiningen/template +++ b/srcpkgs/leiningen/template @@ -1,23 +1,24 @@ # Template file for 'leiningen' pkgname=leiningen -version=2.9.5 +version=2.10.0 revision=1 +_jar_id=43cebda5-a7c2-405b-b641-5143a00051b5 depends="bash virtual?java-runtime" short_desc="Automate Clojure projects without setting your hair on fire" -maintainer="Orphaned <orphan@voidlinux.org>" +maintainer="Adam Frey <adam@adamfrey.me>" license="EPL-2.0" homepage="http://leiningen.org/" -distfiles="https://github.com/technomancy/${pkgname}/archive/${version}.tar.gz - https://github.com/technomancy/${pkgname}/releases/download/${version}/leiningen-${version}-standalone.zip" -checksum="a29b45966e5cc1a37d5dc07fe436ed7cb172c88c53d44a049956ff53a096d43e - df490c98bfe8d667bc5d83b80238528877234c285d0d48f61a4c8743c2db1eea" -skip_extraction="leiningen-${version}-standalone.zip" +distfiles="https://codeberg.org/${pkgname}/${pkgname}/archive/${version}.tar.gz + https://codeberg.org/attachments/${_jar_id}" +checksum="6b04dbe0934ab4c34dc27b0055ad290d2ba9c0f454c1bda7defa58d62946b743 + d27299bad34075ac2864d0bd0559f835c6e2c476c0b0a283bcbdb574fdadbb34" +skip_extraction="${_jar_id}" do_install() { vbin bin/lein-pkg lein vman doc/lein.1 - vinstall ${XBPS_SRCDISTDIR}/${pkgname}-${version}/leiningen-${version}-standalone.zip \ + vinstall ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_jar_id} \ 644 usr/share/java leiningen-${version}-standalone.jar vcompletion zsh_completion.zsh zsh lein vcompletion bash_completion.bash bash lein
[-- Attachment #1: Type: text/plain, Size: 374 bytes --] New review comment by AdamFrey on void-packages repository https://github.com/void-linux/void-packages/pull/41825#discussion_r1084564551 Comment: Oops, I was confused about the `skip_extraction` functionality. I force-pushed [a new commit](https://github.com/void-linux/void-packages/pull/41825/commits/aac814bfdaa78cf1a4585b4975a1c9cc4573aa1f) which avoids `do_extract`.
[-- Attachment #1: Type: text/plain, Size: 257 bytes --] New review comment by AdamFrey on void-packages repository https://github.com/void-linux/void-packages/pull/41825#discussion_r1084564850 Comment: :+1: https://github.com/void-linux/void-packages/pull/41825/commits/aac814bfdaa78cf1a4585b4975a1c9cc4573aa1f
[-- Attachment #1: Type: text/plain, Size: 298 bytes --] New review comment by icp1994 on void-packages repository https://github.com/void-linux/void-packages/pull/41825#discussion_r1085085396 Comment: ```suggestion license="EPL-1.0" homepage="https://leiningen.org/" changelog="https://codeberg.org/leiningen/leiningen/raw/branch/main/NEWS.md" ```
[-- Attachment #1: Type: text/plain, Size: 491 bytes --] There is an updated pull request by AdamFrey against master on the void-packages repository https://github.com/AdamFrey/void-packages leiningen-2.10.0 https://github.com/void-linux/void-packages/pull/41825 leiningen: update to 2.10.0. #### Testing the changes - I tested the changes in this PR: **YES** #### Local build testing - I built this PR locally for my native architecture, (x86_64) A patch file from https://github.com/void-linux/void-packages/pull/41825.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-leiningen-2.10.0-41825.patch --] [-- Type: text/x-diff, Size: 3058 bytes --] From aac814bfdaa78cf1a4585b4975a1c9cc4573aa1f Mon Sep 17 00:00:00 2001 From: Adam Frey <adam@adamfrey.me> Date: Mon, 23 Jan 2023 15:14:37 -0500 Subject: [PATCH 1/2] leiningen: update to 2.10.0. --- srcpkgs/leiningen/template | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/srcpkgs/leiningen/template b/srcpkgs/leiningen/template index bed67800d0e5..ab2007afc7e4 100644 --- a/srcpkgs/leiningen/template +++ b/srcpkgs/leiningen/template @@ -1,23 +1,24 @@ # Template file for 'leiningen' pkgname=leiningen -version=2.9.5 +version=2.10.0 revision=1 +_jar_id=43cebda5-a7c2-405b-b641-5143a00051b5 depends="bash virtual?java-runtime" short_desc="Automate Clojure projects without setting your hair on fire" -maintainer="Orphaned <orphan@voidlinux.org>" +maintainer="Adam Frey <adam@adamfrey.me>" license="EPL-2.0" homepage="http://leiningen.org/" -distfiles="https://github.com/technomancy/${pkgname}/archive/${version}.tar.gz - https://github.com/technomancy/${pkgname}/releases/download/${version}/leiningen-${version}-standalone.zip" -checksum="a29b45966e5cc1a37d5dc07fe436ed7cb172c88c53d44a049956ff53a096d43e - df490c98bfe8d667bc5d83b80238528877234c285d0d48f61a4c8743c2db1eea" -skip_extraction="leiningen-${version}-standalone.zip" +distfiles="https://codeberg.org/${pkgname}/${pkgname}/archive/${version}.tar.gz + https://codeberg.org/attachments/${_jar_id}" +checksum="6b04dbe0934ab4c34dc27b0055ad290d2ba9c0f454c1bda7defa58d62946b743 + d27299bad34075ac2864d0bd0559f835c6e2c476c0b0a283bcbdb574fdadbb34" +skip_extraction="${_jar_id}" do_install() { vbin bin/lein-pkg lein vman doc/lein.1 - vinstall ${XBPS_SRCDISTDIR}/${pkgname}-${version}/leiningen-${version}-standalone.zip \ + vinstall ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_jar_id} \ 644 usr/share/java leiningen-${version}-standalone.jar vcompletion zsh_completion.zsh zsh lein vcompletion bash_completion.bash bash lein From b5aac7eacfea7ba4cef2108fc497a44addcde857 Mon Sep 17 00:00:00 2001 From: Adam Frey <adam@adamfrey.me> Date: Tue, 24 Jan 2023 08:29:42 -0500 Subject: [PATCH 2/2] Add changelog to leiningen template Co-authored-by: icp <pangolin@vivaldi.net> --- srcpkgs/leiningen/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/leiningen/template b/srcpkgs/leiningen/template index ab2007afc7e4..1596a3cee127 100644 --- a/srcpkgs/leiningen/template +++ b/srcpkgs/leiningen/template @@ -6,8 +6,9 @@ _jar_id=43cebda5-a7c2-405b-b641-5143a00051b5 depends="bash virtual?java-runtime" short_desc="Automate Clojure projects without setting your hair on fire" maintainer="Adam Frey <adam@adamfrey.me>" -license="EPL-2.0" -homepage="http://leiningen.org/" +license="EPL-1.0" +homepage="https://leiningen.org/" +changelog="https://codeberg.org/leiningen/leiningen/raw/branch/main/NEWS.md" distfiles="https://codeberg.org/${pkgname}/${pkgname}/archive/${version}.tar.gz https://codeberg.org/attachments/${_jar_id}" checksum="6b04dbe0934ab4c34dc27b0055ad290d2ba9c0f454c1bda7defa58d62946b743
[-- Attachment #1: Type: text/plain, Size: 247 bytes --] New comment by AdamFrey on void-packages repository https://github.com/void-linux/void-packages/pull/41825#issuecomment-1404215183 Comment: @icp1994 I committed your change, which seemed to cause the linter to fail, but I can't figure out why.
[-- Attachment #1: Type: text/plain, Size: 271 bytes --] New comment by paper42 on void-packages repository https://github.com/void-linux/void-packages/pull/41825#issuecomment-1404245888 Comment: This PR now contains two commits, one with a commit message that's wrong, so it complains about that. Squash the commits to one.
[-- Attachment #1: Type: text/plain, Size: 314 bytes --] New comment by classabbyamp on void-packages repository https://github.com/void-linux/void-packages/pull/41825#issuecomment-1404246113 Comment: > b5aac7eac: subject does not follow CONTRIBUTING.md guildelines see https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#committing-your-changes
[-- Attachment #1: Type: text/plain, Size: 491 bytes --] There is an updated pull request by AdamFrey against master on the void-packages repository https://github.com/AdamFrey/void-packages leiningen-2.10.0 https://github.com/void-linux/void-packages/pull/41825 leiningen: update to 2.10.0. #### Testing the changes - I tested the changes in this PR: **YES** #### Local build testing - I built this PR locally for my native architecture, (x86_64) A patch file from https://github.com/void-linux/void-packages/pull/41825.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-leiningen-2.10.0-41825.patch --] [-- Type: text/x-diff, Size: 2076 bytes --] From 21bc3f537039fc2419e352ebd6a86dc06a935da7 Mon Sep 17 00:00:00 2001 From: Adam Frey <adam@adamfrey.me> Date: Mon, 23 Jan 2023 15:14:37 -0500 Subject: [PATCH] leiningen: update to 2.10.0. --- srcpkgs/leiningen/template | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/srcpkgs/leiningen/template b/srcpkgs/leiningen/template index bed67800d0e5..1596a3cee127 100644 --- a/srcpkgs/leiningen/template +++ b/srcpkgs/leiningen/template @@ -1,23 +1,25 @@ # Template file for 'leiningen' pkgname=leiningen -version=2.9.5 +version=2.10.0 revision=1 +_jar_id=43cebda5-a7c2-405b-b641-5143a00051b5 depends="bash virtual?java-runtime" short_desc="Automate Clojure projects without setting your hair on fire" -maintainer="Orphaned <orphan@voidlinux.org>" -license="EPL-2.0" -homepage="http://leiningen.org/" -distfiles="https://github.com/technomancy/${pkgname}/archive/${version}.tar.gz - https://github.com/technomancy/${pkgname}/releases/download/${version}/leiningen-${version}-standalone.zip" -checksum="a29b45966e5cc1a37d5dc07fe436ed7cb172c88c53d44a049956ff53a096d43e - df490c98bfe8d667bc5d83b80238528877234c285d0d48f61a4c8743c2db1eea" -skip_extraction="leiningen-${version}-standalone.zip" +maintainer="Adam Frey <adam@adamfrey.me>" +license="EPL-1.0" +homepage="https://leiningen.org/" +changelog="https://codeberg.org/leiningen/leiningen/raw/branch/main/NEWS.md" +distfiles="https://codeberg.org/${pkgname}/${pkgname}/archive/${version}.tar.gz + https://codeberg.org/attachments/${_jar_id}" +checksum="6b04dbe0934ab4c34dc27b0055ad290d2ba9c0f454c1bda7defa58d62946b743 + d27299bad34075ac2864d0bd0559f835c6e2c476c0b0a283bcbdb574fdadbb34" +skip_extraction="${_jar_id}" do_install() { vbin bin/lein-pkg lein vman doc/lein.1 - vinstall ${XBPS_SRCDISTDIR}/${pkgname}-${version}/leiningen-${version}-standalone.zip \ + vinstall ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_jar_id} \ 644 usr/share/java leiningen-${version}-standalone.jar vcompletion zsh_completion.zsh zsh lein vcompletion bash_completion.bash bash lein
[-- Attachment #1: Type: text/plain, Size: 494 bytes --] New comment by AdamFrey on void-packages repository https://github.com/void-linux/void-packages/pull/41825#issuecomment-1406483463 Comment: > > [b5aac7e](https://github.com/void-linux/void-packages/commit/b5aac7eacfea7ba4cef2108fc497a44addcde857): subject does not follow CONTRIBUTING.md guildelines > > see https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#committing-your-changes I see, thank you. I squashed my commits together and force pushed to this branch.
[-- Attachment #1: Type: text/plain, Size: 196 bytes --] New comment by AdamFrey on void-packages repository https://github.com/void-linux/void-packages/pull/41825#issuecomment-1429732500 Comment: Are there any other changes I should make to this PR?
[-- Attachment #1: Type: text/plain, Size: 305 bytes --] New comment by github-actions[bot] on void-packages repository https://github.com/void-linux/void-packages/pull/41825#issuecomment-1548852219 Comment: Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
[-- Attachment #1: Type: text/plain, Size: 250 bytes --] New review comment by classabbyamp on void-packages repository https://github.com/void-linux/void-packages/pull/41825#discussion_r1194526485 Comment: ```suggestion distfiles="https://codeberg.org/leiningen/leiningen/archive/${version}.tar.gz ```
[-- Attachment #1: Type: text/plain, Size: 491 bytes --] There is an updated pull request by AdamFrey against master on the void-packages repository https://github.com/AdamFrey/void-packages leiningen-2.10.0 https://github.com/void-linux/void-packages/pull/41825 leiningen: update to 2.10.0. #### Testing the changes - I tested the changes in this PR: **YES** #### Local build testing - I built this PR locally for my native architecture, (x86_64) A patch file from https://github.com/void-linux/void-packages/pull/41825.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-leiningen-2.10.0-41825.patch --] [-- Type: text/x-diff, Size: 2074 bytes --] From 7e867c5db7ed83cf476e6c3be10a5d4b1337a9dd Mon Sep 17 00:00:00 2001 From: Adam Frey <adam@adamfrey.me> Date: Mon, 23 Jan 2023 15:14:37 -0500 Subject: [PATCH] leiningen: update to 2.10.0. --- srcpkgs/leiningen/template | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/srcpkgs/leiningen/template b/srcpkgs/leiningen/template index bed67800d0e5..811f27f1f473 100644 --- a/srcpkgs/leiningen/template +++ b/srcpkgs/leiningen/template @@ -1,23 +1,25 @@ # Template file for 'leiningen' pkgname=leiningen -version=2.9.5 +version=2.10.0 revision=1 +_jar_id=43cebda5-a7c2-405b-b641-5143a00051b5 depends="bash virtual?java-runtime" short_desc="Automate Clojure projects without setting your hair on fire" -maintainer="Orphaned <orphan@voidlinux.org>" -license="EPL-2.0" -homepage="http://leiningen.org/" -distfiles="https://github.com/technomancy/${pkgname}/archive/${version}.tar.gz - https://github.com/technomancy/${pkgname}/releases/download/${version}/leiningen-${version}-standalone.zip" -checksum="a29b45966e5cc1a37d5dc07fe436ed7cb172c88c53d44a049956ff53a096d43e - df490c98bfe8d667bc5d83b80238528877234c285d0d48f61a4c8743c2db1eea" -skip_extraction="leiningen-${version}-standalone.zip" +maintainer="Adam Frey <adam@adamfrey.me>" +license="EPL-1.0" +homepage="https://leiningen.org/" +changelog="https://codeberg.org/leiningen/leiningen/raw/branch/main/NEWS.md" +distfiles="https://codeberg.org/leiningen/leiningen/archive/${version}.tar.gz + https://codeberg.org/attachments/${_jar_id}" +checksum="6b04dbe0934ab4c34dc27b0055ad290d2ba9c0f454c1bda7defa58d62946b743 + d27299bad34075ac2864d0bd0559f835c6e2c476c0b0a283bcbdb574fdadbb34" +skip_extraction="${_jar_id}" do_install() { vbin bin/lein-pkg lein vman doc/lein.1 - vinstall ${XBPS_SRCDISTDIR}/${pkgname}-${version}/leiningen-${version}-standalone.zip \ + vinstall ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_jar_id} \ 644 usr/share/java leiningen-${version}-standalone.jar vcompletion zsh_completion.zsh zsh lein vcompletion bash_completion.bash bash lein
[-- Attachment #1: Type: text/plain, Size: 268 bytes --] New review comment by AdamFrey on void-packages repository https://github.com/void-linux/void-packages/pull/41825#discussion_r1195009007 Comment: addressed here: https://github.com/void-linux/void-packages/pull/41825/commits/7e867c5db7ed83cf476e6c3be10a5d4b1337a9dd
[-- Attachment #1: Type: text/plain, Size: 324 bytes --] There's a merged pull request on the void-packages repository leiningen: update to 2.10.0. https://github.com/void-linux/void-packages/pull/41825 Description: #### Testing the changes - I tested the changes in this PR: **YES** #### Local build testing - I built this PR locally for my native architecture, (x86_64)