meteor: 2.7.3 -> 3.4

diff: https://github.com/meteor/meteor/compare/release-2.7.3...release-3.4
This commit is contained in:
Hythera
2026-04-19 20:13:16 +02:00
parent 20985100c4
commit 7ee18fd77a
2 changed files with 32 additions and 28 deletions
+8 -14
View File
@@ -1,10 +1,10 @@
diff --git a/tools/cli/main.js b/tools/cli/main.js
index 84f94bc..4fbda17 100644
index 03a9633..86f37ec 100644
--- a/tools/cli/main.js
+++ b/tools/cli/main.js
@@ -554,6 +554,44 @@
}).await());
} // Now exec; we're not coming back.
@@ -530,6 +530,45 @@ var oldSpringboard = async function (toolsVersion) {
// process, so that the springboarded process can reestablish it.
await catalog.official.closePermanently();
+ // BEGIN HACK
+ // patch shebang:
@@ -44,13 +44,7 @@ index 84f94bc..4fbda17 100644
+ patchelf("mongodb", "bin", "mongo");
+ patchelf("mongodb", "bin", "mongod");
+ // END HACK
require('kexec')(executable, newArgv);
@@ -1485,4 +1523,4 @@
process.exit(ret);
}).run();
-//# sourceMappingURL=main.js.map
\ No newline at end of file
+//# sourceMappingURL=main.js.map
+
// Now exec; we're not coming back.
require('kexec')(cmd, newArgv);
throw Error('exec failed?');
+24 -14
View File
@@ -5,23 +5,28 @@
zlib,
curl,
xz,
openssl,
patchelf,
runtimeShell,
}:
let
version = "2.7.3";
version = "3.4";
inherit (stdenv.hostPlatform) system;
srcs = {
x86_64-linux = fetchurl {
url = "https://static-meteor.netdna-ssl.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz";
sha256 = "sha256-ovsE7jUJIKf96WEoITXECUlPo+o1tEKvHzCc7Xgj614=";
url = "https://static.meteor.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz";
hash = "sha256-tzzRN9UAH7+BM3fs76U5H20vD0LGMpdrMDDiJtchgEg=";
};
x86_64-darwin = fetchurl {
url = "https://static-meteor.netdna-ssl.com/packages-bootstrap/${version}/meteor-bootstrap-os.osx.x86_64.tar.gz";
sha256 = "11206dbda50a680fdab7044def7ea68ea8f4a9bca948ca56df91fe1392b2ac16";
url = "https://static.meteor.com/packages-bootstrap/${version}/meteor-bootstrap-os.osx.x86_64.tar.gz";
hash = "sha256-Z9Had9hscEjxHch19KCYUTqN4OikYLfz1tqEpyxw2Y8=";
};
aarch64-darwin = fetchurl {
url = "https://static.meteor.com/packages-bootstrap/${version}/meteor-bootstrap-os.osx.arm64.tar.gz";
hash = "sha256-AT7njZTgf/WTHlvLEbF3dXKNoqyqHy8KloBQ4gsbPuM=";
};
};
in
@@ -67,23 +72,27 @@ stdenv.mkDerivation {
chmod +x $out/bin/meteor
'';
postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
postFixup = ''
# Remove dangling symlinks
find $out -xtype l -ls -exec rm {} \;
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
# Patch Meteor to dynamically fixup shebangs and ELF metadata where
# necessary.
pushd $out
patch -p1 < ${./main.patch}
popd
substituteInPlace $out/tools/cli/main.js \
--replace "@INTERPRETER@" "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--replace "@RPATH@" "${
--replace-fail "@INTERPRETER@" "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--replace-fail "@RPATH@" "${
lib.makeLibraryPath [
stdenv.cc.cc
zlib
curl
stdenv.cc.cc
xz
zlib
]
}" \
--replace "@PATCHELF@" "${patchelf}/bin/patchelf"
--replace-fail "@PATCHELF@" "${patchelf}/bin/patchelf"
# Patch node.
patchelf \
@@ -92,15 +101,16 @@ stdenv.mkDerivation {
$out/dev_bundle/bin/node
# Patch mongo.
for p in $out/dev_bundle/mongodb/bin/mongo{,d}; do
for p in $out/dev_bundle/mongodb/bin/mongo{d,s}; do
patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
--set-rpath "$(patchelf --print-rpath $p):${
lib.makeLibraryPath [
stdenv.cc.cc
zlib
curl
openssl
stdenv.cc.cc
xz
zlib
]
}" \
$p