Merge pull request #236392 from r-ryantm/auto-update/wiki-js

wiki-js: 2.5.298 -> 2.5.299
This commit is contained in:
Maximilian Bosch 2023-06-08 16:04:50 +02:00 committed by GitHub
commit 05fa952d15
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 2 deletions

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "wiki-js";
version = "2.5.298";
version = "2.5.299";
src = fetchurl {
url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz";
sha256 = "sha256-O7KQ134zh9ullYyQZimmxfdRwXeHkD8aAhy/pRzIjxo=";
sha256 = "sha256-GYe05dbR8RwCzPedeCMUQTWZ51roM/V2jUPPv7o7UEU=";
};
# Implements nodejs 18 support as it's not planned to fix this before
@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
# [1] https://github.com/requarks/wiki/discussions/6388
# [2] https://nodejs.org/en/blog/release/v17.0.0
# [3] https://nodejs.org/en/blog/release/v18.0.0
patches = [ ./drop-node-check.patch ];
nativeBuildInputs = [ jq moreutils ];
postPatch = ''
# Dirty hack to implement nodejs-18 support.

View file

@ -0,0 +1,19 @@
diff --git a/server/index.js b/server/index.js
index 7cdb4f80..161ebeb7 100644
--- a/server/index.js
+++ b/server/index.js
@@ -8,14 +8,6 @@ const { nanoid } = require('nanoid')
const { DateTime } = require('luxon')
const { gte } = require('semver')
-// ----------------------------------------
-// Check Node.js version
-// ----------------------------------------
-if (gte(process.version, '18.0.0')) {
- console.error('You\'re using an unsupported Node.js version. Please read the requirements.')
- process.exit(1)
-}
-
// ----------------------------------------
// Init WIKI instance
// ----------------------------------------