diff options
| author | Gabriel Adomnicai <gabesoft@gmail.com> | 2017-09-13 12:35:36 -0700 |
|---|---|---|
| committer | Joachim F <joachifm@users.noreply.github.com> | 2017-09-13 19:35:36 +0000 |
| commit | 49eb1664d82a1dd2c42442029524304ddb69a0db (patch) | |
| tree | c9845fb49784e8aa2efeb61a784d945c5cb1401c /pkgs/servers/meteor | |
| parent | 4ffa9ace43906ebdf89e0fac3cedbdd5b6cb1b58 (diff) | |
meteor: 1.4.2.3 -> 1.5 (#28905)
Diffstat (limited to 'pkgs/servers/meteor')
| -rw-r--r-- | pkgs/servers/meteor/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/meteor/main.patch | 18 |
2 files changed, 15 insertions, 9 deletions
diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index 0b82f1deef62..132f812bf464 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -2,14 +2,14 @@ let bootstrap = fetchurl { - url = "https://meteorinstall-4168.kxcdn.com/packages-bootstrap/1.4.2.3/meteor-bootstrap-os.linux.x86_64.tar.gz"; - sha256 = "1x5dp8y731qai882ghy3337844lc686r15a4dd9wjx2zvy7wmwhz"; + url = "https://meteorinstall-4168.kxcdn.com/packages-bootstrap/1.5/meteor-bootstrap-os.linux.x86_64.tar.gz"; + sha256 = "0cwwqv88h1ji7g4zmfz34xsrxkn640wr11ddjq5c6b9ygcljci3p"; }; in stdenv.mkDerivation rec { name = "meteor-${version}"; - version = "1.4.2.3"; + version = "1.5"; dontStrip = true; diff --git a/pkgs/servers/meteor/main.patch b/pkgs/servers/meteor/main.patch index 4c21a29a05c4..3282c91abac8 100644 --- a/pkgs/servers/meteor/main.patch +++ b/pkgs/servers/meteor/main.patch @@ -2,9 +2,9 @@ diff --git a/tools/cli/main.js b/tools/cli/main.js index 84f94bc..4fbda17 100644 --- a/tools/cli/main.js +++ b/tools/cli/main.js -@@ -484,6 +484,45 @@ var springboard = function (rel, options) { - process.exit(ret.wait()); - } +@@ -554,6 +554,44 @@ + }).await()); + } // Now exec; we're not coming back. + // BEGIN HACK + // patch shebang: @@ -44,7 +44,13 @@ index 84f94bc..4fbda17 100644 + patchelf("mongodb", "bin", "mongo"); + patchelf("mongodb", "bin", "mongod"); + // END HACK -+ - // Now exec; we're not coming back. + require('kexec')(executable, newArgv); - throw Error('exec failed?'); + +@@ -1485,4 +1523,4 @@ + + process.exit(ret); + }).run(); +-//# sourceMappingURL=main.js.map +\ No newline at end of file ++//# sourceMappingURL=main.js.map |