Re: [PR PATCH] [Updated] nodeenv: update to 1.7.0.

[icp1994 <icp1994@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 477 bytes --]

There is an updated pull request by icp1994 against master on the void-packages repository

https://github.com/icp1994/void-packages nodeenv
https://github.com/void-linux/void-packages/pull/41473

nodeenv: update to 1.7.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/41473.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nodeenv-41473.patch --]
[-- Type: text/x-diff, Size: 3502 bytes --]

From 05bdbd8160e7aee5487fa34770157206013e4b52 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 5 Jan 2023 18:25:37 +0530
Subject: [PATCH] nodeenv: update to 1.7.0.

---
 .../nodeenv/patches/fix-i686-and-musl.patch   | 20 +++++++++----------
 srcpkgs/nodeenv/template                      | 16 ++++++++++-----
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/nodeenv/patches/fix-i686-and-musl.patch b/srcpkgs/nodeenv/patches/fix-i686-and-musl.patch
index fa75c0f7a6b7..5ba017889fb8 100644
--- a/srcpkgs/nodeenv/patches/fix-i686-and-musl.patch
+++ b/srcpkgs/nodeenv/patches/fix-i686-and-musl.patch
@@ -1,5 +1,5 @@
---- a/tests/nodeenv_test.py.orig	2021-04-09 01:10:31.000000000 -0700
-+++ b/tests/nodeenv_test.py	2021-11-06 15:08:23.169976189 -0700
+--- a/tests/nodeenv_test.py
++++ b/tests/nodeenv_test.py
 @@ -108,7 +108,7 @@ def test_mirror_option():
              ('',
               'https://nodejs.org/download/release/index.json')]
@@ -9,9 +9,9 @@
      # Check if running on musl system and delete last mirror if it is
      if sys_type in musl_type:
          urls.pop()
---- a/nodeenv.py.orig	2021-04-09 01:10:31.000000000 -0700
-+++ b/nodeenv.py	2021-12-06 12:55:47.748645252 -0700
-@@ -510,8 +510,21 @@ def get_root_url(version):
+--- a/nodeenv.py
++++ b/nodeenv.py
+@@ -526,8 +526,21 @@ def get_root_url(version):
          return src_base_url
  
  
@@ -34,7 +34,7 @@
  
  
  def get_node_bin_url(version):
-@@ -1057,13 +1070,17 @@ def main():
+@@ -1082,13 +1095,17 @@ def main():
          else:
              src_domain = opt.mirror
      # use unofficial builds only if musl and no explicitly chosen mirror
@@ -46,10 +46,10 @@
      if src_base_url is None:
          src_base_url = 'https://%s/download/release' % src_domain
  
-+    if opt.prebuilt and is_musl() and not is_x86_64_musl():
++    if args.prebuilt and is_musl() and not is_x86_64_musl():
 +        logger.error('No prebuilt Node.js for MUSL libc exists!')
 +        exit(1)
 +
-     if not opt.node or opt.node.lower() == 'latest':
-         opt.node = get_last_stable_node_version()
-     elif opt.node.lower() == 'lts':
+     if not args.node or args.node.lower() == 'latest':
+         args.node = get_last_stable_node_version()
+     elif args.node.lower() == 'lts':
diff --git a/srcpkgs/nodeenv/template b/srcpkgs/nodeenv/template
index 2bfb92a5a67e..f54b54d5badb 100644
--- a/srcpkgs/nodeenv/template
+++ b/srcpkgs/nodeenv/template
@@ -1,7 +1,7 @@
 # Template file for 'nodeenv'
 pkgname=nodeenv
-version=1.6.0
-revision=2
+version=1.7.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="make python3-setuptools"
@@ -9,9 +9,15 @@ checkdepends="nodejs python3-coverage python3-mock python3-pytest which"
 short_desc="Node.js virtual environment builder"
 maintainer="Joseph Benden <joe@benden.us>"
 license="BSD-3-Clause"
-homepage="https://github.com/ekalinin/nodeenv"
-distfiles="https://github.com/ekalinin/nodeenv/archive/${version}.tar.gz"
-checksum=87b04b0832d38bd825e004e7c8ed82d75524efaa6b8a72e3a55088d93e4e17f7
+homepage="https://ekalinin.github.io/nodeenv/"
+distfiles="https://github.com/ekalinin/nodeenv/archive/refs/tags/${version}.tar.gz"
+checksum=a9e9e36e1be6439e877c53e7f27ce068f75b82cc08201f2c68471687199cfd7b
+
+if [ "$XBPS_WORDSIZE" -eq 32 ]; then
+	# nodejs upstream doesn't provide 32-bit pre-built binaries
+	# for linux, which is required for testing
+	make_check=no
+fi
 
 post_install() {
 	vlicense LICENSE