From 96fbaff5726f334236c27370f6f1786ad5cc040e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 Jun 2023 03:59:16 +0000 Subject: [PATCH 1/2] wiki-js: 2.5.298 -> 2.5.299 --- pkgs/servers/web-apps/wiki-js/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wiki-js/default.nix b/pkgs/servers/web-apps/wiki-js/default.nix index 604599c3ca1c..374c270689c1 100644 --- a/pkgs/servers/web-apps/wiki-js/default.nix +++ b/pkgs/servers/web-apps/wiki-js/default.nix @@ -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 From 93c3b2e75ae9892ff9420a868575a85a0a190271 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 8 Jun 2023 14:37:30 +0200 Subject: [PATCH 2/2] wiki-js: drop node version check We implemented v18 support, so this is not needed. --- pkgs/servers/web-apps/wiki-js/default.nix | 1 + .../web-apps/wiki-js/drop-node-check.patch | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/servers/web-apps/wiki-js/drop-node-check.patch diff --git a/pkgs/servers/web-apps/wiki-js/default.nix b/pkgs/servers/web-apps/wiki-js/default.nix index 374c270689c1..20fa13d1739f 100644 --- a/pkgs/servers/web-apps/wiki-js/default.nix +++ b/pkgs/servers/web-apps/wiki-js/default.nix @@ -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. diff --git a/pkgs/servers/web-apps/wiki-js/drop-node-check.patch b/pkgs/servers/web-apps/wiki-js/drop-node-check.patch new file mode 100644 index 000000000000..227649ba10d2 --- /dev/null +++ b/pkgs/servers/web-apps/wiki-js/drop-node-check.patch @@ -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 + // ----------------------------------------