From 8e38e50b8d509313233606db044ce79ab8a211b5 Mon Sep 17 00:00:00 2001 From: David Herman Date: Sat, 24 Aug 2024 19:29:40 -0700 Subject: [PATCH 1/2] add support for linux-{arm64,x64}-musl --- pkgs/cargo-messages/lib/load.cjs | 4 +- pkgs/cargo-messages/package.json | 31 +++++++++++----- .../platforms/linux-arm64-musl/README.md | 3 ++ .../platforms/linux-arm64-musl/package.json | 37 +++++++++++++++++++ .../platforms/linux-x64-musl/README.md | 3 ++ .../platforms/linux-x64-musl/package.json | 37 +++++++++++++++++++ 6 files changed, 105 insertions(+), 10 deletions(-) create mode 100644 pkgs/cargo-messages/platforms/linux-arm64-musl/README.md create mode 100644 pkgs/cargo-messages/platforms/linux-arm64-musl/package.json create mode 100644 pkgs/cargo-messages/platforms/linux-x64-musl/README.md create mode 100644 pkgs/cargo-messages/platforms/linux-x64-musl/package.json diff --git a/pkgs/cargo-messages/lib/load.cjs b/pkgs/cargo-messages/lib/load.cjs index 9c27ec35..ca8686b4 100644 --- a/pkgs/cargo-messages/lib/load.cjs +++ b/pkgs/cargo-messages/lib/load.cjs @@ -7,5 +7,7 @@ module.exports = require('@neon-rs/load').proxy({ 'linux-x64-gnu': () => require('@cargo-messages/linux-x64-gnu'), 'linux-arm-gnueabihf': () => require('@cargo-messages/linux-arm-gnueabihf'), 'android-arm-eabi': () => require('@cargo-messages/android-arm-eabi'), - 'linux-arm64-gnu': () => require('@cargo-messages/linux-arm64-gnu') + 'linux-arm64-gnu': () => require('@cargo-messages/linux-arm64-gnu'), + 'linux-arm64-musl': () => require('@cargo-messages/linux-arm64-musl'), + 'linux-x64-musl': () => require('@cargo-messages/linux-x64-musl') }); diff --git a/pkgs/cargo-messages/package.json b/pkgs/cargo-messages/package.json index 08ca6c5b..f47a11bd 100644 --- a/pkgs/cargo-messages/package.json +++ b/pkgs/cargo-messages/package.json @@ -60,17 +60,30 @@ "neon": { "type": "library", "org": "@cargo-messages", - "platforms": "extended", + "platforms": { + "win32-x64-msvc": "x86_64-pc-windows-msvc", + "darwin-x64": "x86_64-apple-darwin", + "darwin-arm64": "aarch64-apple-darwin", + "linux-x64-gnu": "x86_64-unknown-linux-gnu", + "linux-arm64-gnu": "aarch64-unknown-linux-gnu", + "win32-arm64-msvc": "aarch64-pc-windows-msvc", + "linux-arm-gnueabihf": "armv7-unknown-linux-gnueabihf", + "android-arm-eabi": "armv7-linux-androideabi", + "linux-arm64-musl": "aarch64-unknown-linux-musl", + "linux-x64-musl": "x86_64-unknown-linux-musl" + }, "load": "./lib/load.cjs" }, "optionalDependencies": { - "@cargo-messages/win32-x64-msvc": "0.1.73", - "@cargo-messages/darwin-x64": "0.1.73", - "@cargo-messages/darwin-arm64": "0.1.73", - "@cargo-messages/linux-x64-gnu": "0.1.73", - "@cargo-messages/win32-arm64-msvc": "0.1.73", - "@cargo-messages/linux-arm-gnueabihf": "0.1.73", - "@cargo-messages/android-arm-eabi": "0.1.73", - "@cargo-messages/linux-arm64-gnu": "0.1.73" + "@cargo-messages/win32-x64-msvc": "0.1.77", + "@cargo-messages/darwin-x64": "0.1.77", + "@cargo-messages/darwin-arm64": "0.1.77", + "@cargo-messages/linux-x64-gnu": "0.1.77", + "@cargo-messages/win32-arm64-msvc": "0.1.77", + "@cargo-messages/linux-arm-gnueabihf": "0.1.77", + "@cargo-messages/android-arm-eabi": "0.1.77", + "@cargo-messages/linux-arm64-gnu": "0.1.77", + "@cargo-messages/linux-arm64-musl": "0.1.77", + "@cargo-messages/linux-x64-musl": "0.1.77" } } diff --git a/pkgs/cargo-messages/platforms/linux-arm64-musl/README.md b/pkgs/cargo-messages/platforms/linux-arm64-musl/README.md new file mode 100644 index 00000000..0fa8a9b6 --- /dev/null +++ b/pkgs/cargo-messages/platforms/linux-arm64-musl/README.md @@ -0,0 +1,3 @@ +# `@cargo-messages/linux-arm64-musl` + +Prebuilt binary package for `cargo-messages` on `linux-arm64-musl`. diff --git a/pkgs/cargo-messages/platforms/linux-arm64-musl/package.json b/pkgs/cargo-messages/platforms/linux-arm64-musl/package.json new file mode 100644 index 00000000..2900dc65 --- /dev/null +++ b/pkgs/cargo-messages/platforms/linux-arm64-musl/package.json @@ -0,0 +1,37 @@ +{ + "name": "@cargo-messages/linux-arm64-musl", + "description": "Prebuilt binary package for `cargo-messages` on `linux-arm64-musl`.", + "version": "0.1.77", + "os": [ + "linux" + ], + "cpu": [ + "arm64" + ], + "main": "index.node", + "files": [ + "index.node" + ], + "neon": { + "type": "binary", + "rust": "aarch64-unknown-linux-musl", + "node": "linux-arm64-musl", + "os": "linux", + "arch": "arm64", + "abi": "musl" + }, + "author": "David Herman ", + "repository": { + "type": "git", + "url": "git+https://github.com/dherman/neon-rs.git" + }, + "keywords": [ + "Rust", + "Neon" + ], + "bugs": { + "url": "https://github.com/dherman/neon-rs/issues" + }, + "homepage": "https://github.com/dherman/neon-rs#readme", + "license": "MIT" +} diff --git a/pkgs/cargo-messages/platforms/linux-x64-musl/README.md b/pkgs/cargo-messages/platforms/linux-x64-musl/README.md new file mode 100644 index 00000000..a5f76094 --- /dev/null +++ b/pkgs/cargo-messages/platforms/linux-x64-musl/README.md @@ -0,0 +1,3 @@ +# `@cargo-messages/linux-x64-musl` + +Prebuilt binary package for `cargo-messages` on `linux-x64-musl`. diff --git a/pkgs/cargo-messages/platforms/linux-x64-musl/package.json b/pkgs/cargo-messages/platforms/linux-x64-musl/package.json new file mode 100644 index 00000000..808790f2 --- /dev/null +++ b/pkgs/cargo-messages/platforms/linux-x64-musl/package.json @@ -0,0 +1,37 @@ +{ + "name": "@cargo-messages/linux-x64-musl", + "description": "Prebuilt binary package for `cargo-messages` on `linux-x64-musl`.", + "version": "0.1.77", + "os": [ + "linux" + ], + "cpu": [ + "x64" + ], + "main": "index.node", + "files": [ + "index.node" + ], + "neon": { + "type": "binary", + "rust": "x86_64-unknown-linux-musl", + "node": "linux-x64-musl", + "os": "linux", + "arch": "x64", + "abi": "musl" + }, + "author": "David Herman ", + "repository": { + "type": "git", + "url": "git+https://github.com/dherman/neon-rs.git" + }, + "keywords": [ + "Rust", + "Neon" + ], + "bugs": { + "url": "https://github.com/dherman/neon-rs/issues" + }, + "homepage": "https://github.com/dherman/neon-rs#readme", + "license": "MIT" +} From 4b84503fbd1ca76d58a0a9ef8d8fd94ee3c29a1b Mon Sep 17 00:00:00 2001 From: David Herman Date: Sat, 24 Aug 2024 19:32:45 -0700 Subject: [PATCH 2/2] npm i --- pkgs/package-lock.json | 72 +++++++++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 29 deletions(-) diff --git a/pkgs/package-lock.json b/pkgs/package-lock.json index c41ebcc5..5c5a0a4a 100644 --- a/pkgs/package-lock.json +++ b/pkgs/package-lock.json @@ -22,20 +22,22 @@ "@neon-rs/cli": "^0.1.76" }, "optionalDependencies": { - "@cargo-messages/android-arm-eabi": "0.1.73", - "@cargo-messages/darwin-arm64": "0.1.73", - "@cargo-messages/darwin-x64": "0.1.73", - "@cargo-messages/linux-arm-gnueabihf": "0.1.73", - "@cargo-messages/linux-arm64-gnu": "0.1.73", - "@cargo-messages/linux-x64-gnu": "0.1.73", - "@cargo-messages/win32-arm64-msvc": "0.1.73", - "@cargo-messages/win32-x64-msvc": "0.1.73" + "@cargo-messages/android-arm-eabi": "0.1.77", + "@cargo-messages/darwin-arm64": "0.1.77", + "@cargo-messages/darwin-x64": "0.1.77", + "@cargo-messages/linux-arm-gnueabihf": "0.1.77", + "@cargo-messages/linux-arm64-gnu": "0.1.77", + "@cargo-messages/linux-arm64-musl": "0.1.77", + "@cargo-messages/linux-x64-gnu": "0.1.77", + "@cargo-messages/linux-x64-musl": "0.1.77", + "@cargo-messages/win32-arm64-msvc": "0.1.77", + "@cargo-messages/win32-x64-msvc": "0.1.77" } }, "cargo-messages/node_modules/@cargo-messages/android-arm-eabi": { - "version": "0.1.73", - "resolved": "https://registry.npmjs.org/@cargo-messages/android-arm-eabi/-/android-arm-eabi-0.1.73.tgz", - "integrity": "sha512-CgA4N99Ov4jYcdFesW/kUVo16uRQKELXMom4fH0Dnsogf5Dq0keET99Sbu+8qnliAMI6kl1fCzFuROeE4o94Zg==", + "version": "0.1.77", + "resolved": "https://registry.npmjs.org/@cargo-messages/android-arm-eabi/-/android-arm-eabi-0.1.77.tgz", + "integrity": "sha512-Jz8Chif2JezJjo/KaS+IhJQUM66pkAX26hVgLSxliFtn0A24vvsZ/EyBzih2w+tDqiN3PcK5OJUUQ63PfVHciA==", "cpu": [ "arm" ], @@ -45,9 +47,9 @@ ] }, "cargo-messages/node_modules/@cargo-messages/darwin-arm64": { - "version": "0.1.73", - "resolved": "https://registry.npmjs.org/@cargo-messages/darwin-arm64/-/darwin-arm64-0.1.73.tgz", - "integrity": "sha512-o/k7XPwADI2u+7A/O+0qB+Z36r6krj1SLIk6J2/PBLwNCgZghNAnwqm0aD4avNClxkUgvsuvcx/5nClJ3Z95KA==", + "version": "0.1.77", + "resolved": "https://registry.npmjs.org/@cargo-messages/darwin-arm64/-/darwin-arm64-0.1.77.tgz", + "integrity": "sha512-0/clxdX/LvYCsG0Cq3MHydmoK3yT/wsLcL50pwvCUoZc774F5iWyWIQJPkzaxCsUpGfIPEQf5F4TyYUNlBwOLg==", "cpu": [ "arm64" ], @@ -57,9 +59,9 @@ ] }, "cargo-messages/node_modules/@cargo-messages/darwin-x64": { - "version": "0.1.73", - "resolved": "https://registry.npmjs.org/@cargo-messages/darwin-x64/-/darwin-x64-0.1.73.tgz", - "integrity": "sha512-LGnNt7GNPi9jZhBCg4vBdP7AaVFgOtO3orz9JJegryMpZpJ35wxqb39Ntx8nZ7rMsWyC2RF6HUjizvPRV4oaYQ==", + "version": "0.1.77", + "resolved": "https://registry.npmjs.org/@cargo-messages/darwin-x64/-/darwin-x64-0.1.77.tgz", + "integrity": "sha512-Bxx9CSKeFKi2VJHOUPu0RTDbfKunfGTBYbhzblfB74U4EATwxg63w2AuLzlv6RPw0gNOVTmLDg9cTl9EvxM5kw==", "cpu": [ "x64" ], @@ -69,9 +71,9 @@ ] }, "cargo-messages/node_modules/@cargo-messages/linux-arm-gnueabihf": { - "version": "0.1.73", - "resolved": "https://registry.npmjs.org/@cargo-messages/linux-arm-gnueabihf/-/linux-arm-gnueabihf-0.1.73.tgz", - "integrity": "sha512-rRa5ctEBEry2zfZ0wN30sgFAmyrMu35bMCY0Oz/6dF1FkC11AhgNWiVJAk+p1BpR3Yu1s0X7yCwnVkWt+S3XZA==", + "version": "0.1.77", + "resolved": "https://registry.npmjs.org/@cargo-messages/linux-arm-gnueabihf/-/linux-arm-gnueabihf-0.1.77.tgz", + "integrity": "sha512-90fChaHkC5LSS1wMniuWvZ5LqeVxd27x+sKbB70F8RckCfdMVjbTsmuzwoWXZbKKQsUA9myU5ZXA9ErYVUFcYg==", "cpu": [ "arm" ], @@ -80,10 +82,22 @@ "linux" ] }, + "cargo-messages/node_modules/@cargo-messages/linux-arm64-gnu": { + "version": "0.1.77", + "resolved": "https://registry.npmjs.org/@cargo-messages/linux-arm64-gnu/-/linux-arm64-gnu-0.1.77.tgz", + "integrity": "sha512-MAhutCmb0HYsdX7Ri7eFc04ir84tX3Hkmb55PPGm9Mv1b4hip1vmDOjBNLNo89I/9FeeHjRgl7OTjlK+8jW6PQ==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ] + }, "cargo-messages/node_modules/@cargo-messages/linux-x64-gnu": { - "version": "0.1.73", - "resolved": "https://registry.npmjs.org/@cargo-messages/linux-x64-gnu/-/linux-x64-gnu-0.1.73.tgz", - "integrity": "sha512-Uj2Zy0ve6qImol9M5w873voHIe/Qer/LUci80dBNrgwrBBuXVI8JFkEoBnQ17jqRWsWYrZxNITAL0ZIT2PUTpA==", + "version": "0.1.77", + "resolved": "https://registry.npmjs.org/@cargo-messages/linux-x64-gnu/-/linux-x64-gnu-0.1.77.tgz", + "integrity": "sha512-24MP43WUQkDFJJf/WR8LgP/PJEKxHVGJAxs00mZRQBe90UnBfMq9c2HOOZLSR65cUDLfkB9XhHpX1bXRtTmdEw==", "cpu": [ "x64" ], @@ -93,9 +107,9 @@ ] }, "cargo-messages/node_modules/@cargo-messages/win32-arm64-msvc": { - "version": "0.1.73", - "resolved": "https://registry.npmjs.org/@cargo-messages/win32-arm64-msvc/-/win32-arm64-msvc-0.1.73.tgz", - "integrity": "sha512-EohLJYAn/SoplLzpFwKjSgOeCd9xID7DG/JwLgdUTZKjze+0/ffSlOwQ6lPxl1x7LngzB6yUR4nIybl4Q56N4g==", + "version": "0.1.77", + "resolved": "https://registry.npmjs.org/@cargo-messages/win32-arm64-msvc/-/win32-arm64-msvc-0.1.77.tgz", + "integrity": "sha512-3/aUpCjOE0rtLCHx85ze+syQv6LIwa4eTzkV4jNQHFQqbWpM5eEj5T1jCawJo14gz/4gSCkGnKDiTm/LrFTK5Q==", "cpu": [ "arm64" ], @@ -105,9 +119,9 @@ ] }, "cargo-messages/node_modules/@cargo-messages/win32-x64-msvc": { - "version": "0.1.73", - "resolved": "https://registry.npmjs.org/@cargo-messages/win32-x64-msvc/-/win32-x64-msvc-0.1.73.tgz", - "integrity": "sha512-xDHdcevTQ0mgfsB2z+PdfS7Q6eH07aGPGUVlnGazjGkGoAQojvPWh2JULwv2Z26Pqnq4bOtZAVqEhzQ0ZB6fIg==", + "version": "0.1.77", + "resolved": "https://registry.npmjs.org/@cargo-messages/win32-x64-msvc/-/win32-x64-msvc-0.1.77.tgz", + "integrity": "sha512-ECmhSDRZms3C1IU8WVF9tc3/0JmryhgG3+BNv55lWJEMexSFmPf7LeA8CxFqZDk/gOfmd3Edaa2vWE2IULYetQ==", "cpu": [ "x64" ],