9 files changed, 41 insertions, 94 deletions
diff --git a/nixpkgs/pkgs/servers/web-apps/dolibarr/default.nix b/nixpkgs/pkgs/servers/web-apps/dolibarr/default.nix
index c2e0bfd238e7..9c94ad3bd545 100644
--- a/nixpkgs/pkgs/servers/web-apps/dolibarr/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/dolibarr/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dolibarr";
-  version = "16.0.4";
+  version = "16.0.5";
 
   src = fetchFromGitHub {
     owner = "Dolibarr";
     repo = "dolibarr";
     rev = version;
-    sha256 = "sha256-H0f12pEsRxq6cYrcCjjQF1b5PFQEPBfYhZ5YnBfIbHk=";
+    sha256 = "sha256-+OAkUMwLXZGFPQocJARIG//+0V1Dv5MdZvythbp4KPw=";
   };
 
   dontBuild = true;
diff --git a/nixpkgs/pkgs/servers/web-apps/engelsystem/default.nix b/nixpkgs/pkgs/servers/web-apps/engelsystem/default.nix
index ed67fc57e956..815718bc0c59 100644
--- a/nixpkgs/pkgs/servers/web-apps/engelsystem/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/engelsystem/default.nix
@@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
   version = "3.3.0";
 
   src = fetchzip {
-    url =
-      "https://github.com/engelsystem/engelsystem/releases/download/v3.3.0/engelsystem-v3.3.0.zip";
+    url = "https://github.com/engelsystem/engelsystem/releases/download/v${version}/engelsystem-v${version}.zip";
     hash = "sha256-DS0klm26udXsiiFToeOJooA1WUR8gk0qf/UJL8E77ps=";
   };
 
diff --git a/nixpkgs/pkgs/servers/web-apps/lemmy/package.json b/nixpkgs/pkgs/servers/web-apps/lemmy/package.json
index 8f0b48b50d39..f9b990ec203b 100644
--- a/nixpkgs/pkgs/servers/web-apps/lemmy/package.json
+++ b/nixpkgs/pkgs/servers/web-apps/lemmy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lemmy-ui",
-  "version": "0.18.3",
+  "version": "0.18.4",
   "description": "An isomorphic UI for lemmy",
   "repository": "https://github.com/LemmyNet/lemmy-ui",
   "license": "AGPL-3.0",
@@ -34,9 +34,9 @@
     ]
   },
   "dependencies": {
-    "@babel/plugin-proposal-decorators": "^7.21.0",
-    "@babel/plugin-transform-runtime": "^7.21.4",
-    "@babel/plugin-transform-typescript": "^7.21.3",
+    "@babel/plugin-proposal-decorators": "^7.21.5",
+    "@babel/plugin-transform-runtime": "^7.21.5",
+    "@babel/plugin-transform-typescript": "^7.21.5",
     "@babel/preset-env": "7.21.5",
     "@babel/preset-typescript": "^7.21.5",
     "@babel/runtime": "^7.21.5",
@@ -44,7 +44,7 @@
     "autosize": "^6.0.1",
     "babel-loader": "^9.1.2",
     "babel-plugin-inferno": "^6.6.0",
-    "bootstrap": "^5.2.3",
+    "bootstrap": "^5.3.1",
     "check-password-strength": "^2.0.7",
     "classnames": "^2.3.1",
     "clean-webpack-plugin": "^4.0.0",
@@ -58,7 +58,7 @@
     "express": "~4.18.2",
     "history": "^5.3.0",
     "html-to-text": "^9.0.5",
-    "i18next": "^23.2.8",
+    "i18next": "^23.3.0",
     "inferno": "^8.2.2",
     "inferno-create-element": "^8.2.2",
     "inferno-helmet": "^5.2.1",
@@ -81,20 +81,21 @@
     "register-service-worker": "^1.7.2",
     "run-node-webpack-plugin": "^1.3.0",
     "sanitize-html": "^2.11.0",
-    "sass": "^1.63.6",
+    "sass": "^1.64.1",
     "sass-loader": "^13.3.2",
     "serialize-javascript": "^6.0.1",
     "service-worker-webpack": "^1.0.0",
-    "sharp": "^0.32.1",
+    "sharp": "^0.32.4",
     "tippy.js": "^6.3.7",
     "toastify-js": "^1.12.0",
     "tributejs": "^5.1.3",
-    "webpack": "5.88.1",
+    "webpack": "5.88.2",
     "webpack-cli": "^5.1.4",
     "webpack-node-externals": "^3.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.21.8",
+    "@babel/core": "^7.21.5",
+    "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@types/autosize": "^4.0.0",
     "@types/bootstrap": "^5.2.6",
     "@types/cookie": "^0.5.1",
@@ -102,29 +103,29 @@
     "@types/html-to-text": "^9.0.0",
     "@types/lodash.isequal": "^4.5.6",
     "@types/markdown-it": "^12.2.3",
-    "@types/markdown-it-container": "^2.0.5",
-    "@types/node": "^20.4.0",
+    "@types/markdown-it-container": "^2.0.6",
+    "@types/node": "^20.4.5",
     "@types/path-browserify": "^1.0.0",
     "@types/sanitize-html": "^2.9.0",
     "@types/serialize-javascript": "^5.0.1",
-    "@types/toastify-js": "^1.11.1",
-    "@typescript-eslint/eslint-plugin": "^5.61.0",
-    "@typescript-eslint/parser": "^5.61.0",
-    "eslint": "^8.44.0",
+    "@types/toastify-js": "^1.12.0",
+    "@typescript-eslint/eslint-plugin": "^6.2.0",
+    "@typescript-eslint/parser": "^6.2.0",
+    "eslint": "^8.45.0",
     "eslint-plugin-inferno": "^7.32.2",
     "eslint-plugin-jsx-a11y": "^6.7.1",
-    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-prettier": "^5.0.0",
     "husky": "^8.0.3",
     "import-sort-style-module": "^6.0.0",
     "lint-staged": "^13.2.3",
-    "prettier": "^2.8.8",
+    "prettier": "^3.0.0",
     "prettier-plugin-import-sort": "^0.0.7",
-    "prettier-plugin-organize-imports": "^3.2.2",
-    "prettier-plugin-packagejson": "^2.4.4",
+    "prettier-plugin-organize-imports": "^3.2.3",
+    "prettier-plugin-packagejson": "^2.4.5",
     "rimraf": "^5.0.0",
     "sortpack": "^2.3.4",
     "style-loader": "^3.3.2",
-    "terser": "^5.18.2",
+    "terser": "^5.19.2",
     "typescript": "^5.1.6",
     "typescript-language-server": "^3.3.2",
     "webpack-bundle-analyzer": "^4.9.0",
diff --git a/nixpkgs/pkgs/servers/web-apps/lemmy/pin.json b/nixpkgs/pkgs/servers/web-apps/lemmy/pin.json
index e9250c01347c..a2cd10515833 100644
--- a/nixpkgs/pkgs/servers/web-apps/lemmy/pin.json
+++ b/nixpkgs/pkgs/servers/web-apps/lemmy/pin.json
@@ -1,8 +1,8 @@
 {
-  "serverVersion": "0.18.3",
-  "uiVersion": "0.18.3",
-  "serverHash": "sha256-1feDR3WX4hwaAPEGkM3syb+CsYS3zkzQb2q8be/4UC4=",
-  "serverCargoHash": "sha256-CVZyOwM0BAeIVy74tj4NNE6occ6yo8eWpMhMb1DnoJY=",
-  "uiHash": "sha256-asmn5KQ4hhy1yGoeUrQJZLWXPelnb16utQWYplDqIOg=",
-  "uiYarnDepsHash": "sha256-fRJpA9WstNNNOePoqotJKYmlikkcjc34iM0WO8+a/3Q="
+  "serverVersion": "0.18.4",
+  "uiVersion": "0.18.4",
+  "serverHash": "sha256-J+kjsirEcLz0th3IGVheSShVLbQma1Eip329/q5/3S8=",
+  "serverCargoHash": "sha256-0UDhHa2QvHoNYJIArpc/o+lkq87tBX/XVgXsr7y/+Rk=",
+  "uiHash": "sha256-E/rSNWVjiZE5Hl0iIocQfkIdOFSeB0zYXQDq9A3h3lI=",
+  "uiYarnDepsHash": "sha256-rLP1CQd75nVfI6C0sC21TUskzVfbGHm2fblcYr6JcGc="
 }
diff --git a/nixpkgs/pkgs/servers/web-apps/lemmy/update.py b/nixpkgs/pkgs/servers/web-apps/lemmy/update.py
index 939008253132..4e867553b790 100755
--- a/nixpkgs/pkgs/servers/web-apps/lemmy/update.py
+++ b/nixpkgs/pkgs/servers/web-apps/lemmy/update.py
@@ -1,5 +1,5 @@
 #! /usr/bin/env nix-shell
-#! nix shell -i python3 -p python3 python3.pkgs.semver nix-prefetch-github
+#! nix-shell -i python3 -p python3 python3.pkgs.semver nix-prefetch-github
 from urllib.request import Request, urlopen
 import dataclasses
 import subprocess
diff --git a/nixpkgs/pkgs/servers/web-apps/nifi/default.nix b/nixpkgs/pkgs/servers/web-apps/nifi/default.nix
index 734ced245056..7074fdbe4e8c 100644
--- a/nixpkgs/pkgs/servers/web-apps/nifi/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/nifi/default.nix
@@ -2,18 +2,18 @@
 
 stdenv.mkDerivation rec {
   pname = "nifi";
-  version = "1.22.0";
+  version = "1.23.0";
 
   src = fetchzip {
     url = "mirror://apache/nifi/${version}/nifi-${version}-bin.zip";
-    hash = "sha256-IzTGsD6nL7UrXuHrJc8Dt1C6r137UjT/V4vES2m/8cg=";
+    hash = "sha256-IWmekIrWGvVTOX2MG+3EkX4phWzdrhxH5vNWpsrsrvM=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ jdk11 ];
 
   installPhase = ''
-    mv ../$sourceRoot $out
+    cp -r ../$sourceRoot $out
     rm -f $out/bin/*bat
     rm -rf $out/extensions
     mkdir -p $out/share/nifi
@@ -40,6 +40,7 @@ stdenv.mkDerivation rec {
     license = licenses.asl20;
     homepage = "https://nifi.apache.org";
     platforms = [ "x86_64-linux" ];
+    sourceProvenance = with sourceTypes; [ binaryBytecode ];
     maintainers = with maintainers; [ izorkin ];
   };
 }
diff --git a/nixpkgs/pkgs/servers/web-apps/pict-rs/default.nix b/nixpkgs/pkgs/servers/web-apps/pict-rs/default.nix
index d569fdfbb594..37c344931e4f 100644
--- a/nixpkgs/pkgs/servers/web-apps/pict-rs/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/pict-rs/default.nix
@@ -13,17 +13,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pict-rs";
-  version = "0.4.0";
+  version = "0.4.2";
 
   src = fetchFromGitea {
     domain = "git.asonix.dog";
     owner = "asonix";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-1WNd7Ei21g01S5ko6y+uyhHP+xlGtnrwU8MLMxnW3P8=";
+    sha256 = "sha256-3iY16ld2yKf5PffaS1FUwhWD657OAdY4eWHe5f3fIuQ=";
   };
 
-  cargoHash = "sha256-xD2LvB0xBDAShp4k4VnnhnOWowhU/0OKvkEzI6RzuJY=";
+  cargoHash = "sha256-uRDRBe3rxkTSmO/uWSLQ6JI/t0KFta2kkf2ZihVYw0A=";
 
   # needed for internal protobuf c wrapper library
   PROTOC = "${protobuf}/bin/protoc";
diff --git a/nixpkgs/pkgs/servers/web-apps/wiki-js/default.nix b/nixpkgs/pkgs/servers/web-apps/wiki-js/default.nix
index 20fa13d1739f..b79dffc08371 100644
--- a/nixpkgs/pkgs/servers/web-apps/wiki-js/default.nix
+++ b/nixpkgs/pkgs/servers/web-apps/wiki-js/default.nix
@@ -2,48 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wiki-js";
-  version = "2.5.299";
+  version = "2.5.300";
 
   src = fetchurl {
     url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz";
-    sha256 = "sha256-GYe05dbR8RwCzPedeCMUQTWZ51roM/V2jUPPv7o7UEU=";
+    sha256 = "sha256-Cycq2oeB8v02VtE5KPs09+uzZqvGbJRH+J4YPDYo+yY=";
   };
 
-  # Implements nodejs 18 support as it's not planned to fix this before
-  # the release of v3[1] which is planned to happen in 2023, but not before
-  # NixOS 23.05. However, in the lifespan of 23.05 v16 will get EOLed, so
-  # we have to hack this on our own.
-  #
-  # The problem we fix here is that `exports."/public/"` in a `package.json`
-  # is prohibited, i.e. you cannot export full directories anymore.
-  #
-  # Unfortunately it's non-trivial to fix this because v10 of `extract-files`
-  # (where the problem is fixed) doesn't work for graphql-tools (which depends
-  # on this). Updating this as well is also quite complex because in later
-  # versions the package was split up into multiple smaller packages and
-  # thus a lot of parts of the code-base would need to be changed accordingly.
-  #
-  # Since this is the only breaking change of nodejs 17/18[2][3], this workaround
-  # will be necessary until we can upgrade to v3.
-  #
-  # [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.
-    <./node_modules/extract-files/package.json jq '
-      # error out loud if the structure has changed and we need to change
-      # this expression
-      if .exports|has("./public/")|not then
-        halt_error(1)
-      else
-        .exports."./public/*" = "./public/*.js" | del(.exports."./public/")
-      end
-    ' | sponge ./node_modules/extract-files/package.json
-  '';
-
   sourceRoot = ".";
 
   dontBuild = true;
diff --git a/nixpkgs/pkgs/servers/web-apps/wiki-js/drop-node-check.patch b/nixpkgs/pkgs/servers/web-apps/wiki-js/drop-node-check.patch
deleted file mode 100644
index 227649ba10d2..000000000000
--- a/nixpkgs/pkgs/servers/web-apps/wiki-js/drop-node-check.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
- // ----------------------------------------