pgadmin: 9.4 -> 9.5

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
(cherry picked from commit 0dc4b8e99b)

pkgs/tools/admin/pgadmin/default.nix

@@ -6,7 +6,7 @@
   nixosTests,
   postgresqlTestHook,
   postgresql,
-  yarn-berry_3,
+  yarn-berry_4,
   nodejs,
   autoconf,
   automake,
@@ -22,14 +22,14 @@
 
 let
   pname = "pgadmin";
-  version = "9.4";
-  yarnHash = "sha256-AlAyHtadjmKZb0rHNIlaPtEcGFQ15Fc6rExMsNFGwDc=";
+  version = "9.5";
+  yarnHash = "sha256-i3WCEpcZepB7K0A4QgjoLfkO7icew/8usJCo4DkWT6I=";
 
   src = fetchFromGitHub {
     owner = "pgadmin-org";
     repo = "pgadmin4";
     rev = "REL-${lib.versions.major version}_${lib.versions.minor version}";
-    hash = "sha256-oslp9g63mYeP9CmpCzF80nlyqF1ftGbMRIsp6goJOx4=";
+    hash = "sha256-5FwYkdhpg/2Cidi2qiFhhsQYbIwsp80K3MNxw5rp4ww=";
   };
 
   mozjpeg-bin = fetchFromGitHub {
@@ -59,7 +59,7 @@ in
 pythonPackages.buildPythonApplication rec {
   inherit pname version src;
 
-  offlineCache = yarn-berry_3.fetchYarnBerryDeps {
+  offlineCache = yarn-berry_4.fetchYarnBerryDeps {
     # mozjpeg fails to build on darwin due to a hardocded path
     # this has been fixed upstream on master but no new version
     # has been released. We therefore point yarn to upstream
@@ -154,11 +154,11 @@ pythonPackages.buildPythonApplication rec {
     export LD=$CC
     export HOME=$(mktemp -d)
     export YARN_ENABLE_SCRIPTS=1
-    YARN_IGNORE_PATH=1 ${yarn-berry_3.yarn-berry-offline}/bin/yarn config set enableTelemetry false
-    YARN_IGNORE_PATH=1 ${yarn-berry_3.yarn-berry-offline}/bin/yarn config set enableGlobalCache false
+    YARN_IGNORE_PATH=1 ${yarn-berry_4.yarn-berry-offline}/bin/yarn config set enableTelemetry false
+    YARN_IGNORE_PATH=1 ${yarn-berry_4.yarn-berry-offline}/bin/yarn config set enableGlobalCache false
     export npm_config_nodedir="${srcOnly nodejs}"
     export npm_config_node_gyp="${nodejs}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js"
-    YARN_IGNORE_PATH=1 ${yarn-berry_3.yarn-berry-offline}/bin/yarn install --inline-builds
+    YARN_IGNORE_PATH=1 ${yarn-berry_4.yarn-berry-offline}/bin/yarn install --inline-builds
     )
     yarn webpacker
     cp -r * ../pip-build/pgadmin4
@@ -185,8 +185,8 @@ pythonPackages.buildPythonApplication rec {
     cython
     pip
     sphinx
-    yarn-berry_3
-    yarn-berry_3.yarnBerryConfigHook
+    yarn-berry_4
+    yarn-berry_4.yarnBerryConfigHook
     nodejs
 
     # for building mozjpeg2

pkgs/tools/admin/pgadmin/mozjpeg.patch

@@ -1,45 +1,44 @@
 diff --git a/yarn.lock b/yarn.lock
-index fa189ef..54066a6 100644
+index 8bfff31..0f12f87 100644
 --- a/yarn.lock
 +++ b/yarn.lock
-@@ -7299,6 +7299,23 @@ __metadata:
+@@ -7347,6 +7347,23 @@ __metadata:
    languageName: node
    linkType: hard
- 
+
 +"execa@npm:^7.1.1":
 +  version: 7.1.1
 +  resolution: "execa@npm:7.1.1"
 +  dependencies:
-+    cross-spawn: ^7.0.3
-+    get-stream: ^6.0.1
-+    human-signals: ^3.0.1
-+    is-stream: ^3.0.0
-+    merge-stream: ^2.0.0
-+    npm-run-path: ^5.1.0
-+    onetime: ^6.0.0
-+    signal-exit: ^3.0.7
-+    strip-final-newline: ^3.0.0
-+  checksum: 21fa46fc69314ace4068cf820142bdde5b643a5d89831c2c9349479c1555bff137a291b8e749e7efca36535e4e0a8c772c11008ca2e84d2cbd6ca141a3c8f937
++    cross-spawn: "npm:^7.0.3"
++    get-stream: "npm:^6.0.1"
++    human-signals: "npm:^3.0.1"
++    is-stream: "npm:^3.0.0"
++    merge-stream: "npm:^2.0.0"
++    npm-run-path: "npm:^5.1.0"
++    onetime: "npm:^6.0.0"
++    signal-exit: "npm:^3.0.7"
++    strip-final-newline: "npm:^3.0.0"
++  checksum: 0da5ee1c895b62142bc3d1567d1974711c28c2cfa6bae96e1923379bd597e476d762a13f282f92815d8ebfa33407949634fa32a0d6db8334a20e625fe11d4351
 +  languageName: node
 +  linkType: hard
 +
  "executable@npm:^4.1.0":
    version: 4.1.1
    resolution: "executable@npm:4.1.1"
-@@ -11027,13 +11044,14 @@ __metadata:
- 
+@@ -11120,13 +11137,14 @@ __metadata:
+
  "mozjpeg@npm:^8.0.0":
    version: 8.0.0
 -  resolution: "mozjpeg@npm:8.0.0"
 +  resolution: "mozjpeg@https://github.com/imagemin/mozjpeg-bin.git#commit=c0587fbc00b21ed8cad8bae499a0827baeaf7ffa"
    dependencies:
-     bin-build: ^3.0.0
-     bin-wrapper: ^4.0.0
-+    execa: ^7.1.1
+     bin-build: "npm:^3.0.0"
+     bin-wrapper: "npm:^4.0.0"
++    execa: "npm:^7.1.1"
    bin:
      mozjpeg: cli.js
--  checksum: cba27c2efbc21a48434da1c6c8d6886988432430f958315fc59ef9b52bc2d6ee597e19f1cf6aae0fd611d5b2a113561fe2e85ec30a1ccd55c007340c638eb557
+-  checksum: 10c0/e91294c15bb31dcaa5eb0780e772214052aa8cb1efc35f74a5c4fe85c9af9d3d6e2f3dc64d3379a86a63b5cbc86a2618c23e350c9131e55ac76726647537b7e8
 +  checksum: cba27c2efbc21a48434da1c6c8d6886988432430f958315fc59ef9b52bc2d6ee597e19f1cf6aae0fd611d5b2a113561fe2e85ec30a1ccd55c007340c638eb556
    languageName: node
-   linkType: hard
- 
+   linkType: hard

pkgs/tools/admin/pgadmin/update.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl wget jq common-updater-scripts yarn-berry_3 yarn-berry_3.yarn-berry-fetcher
+#!nix-shell -i bash -p curl wget jq common-updater-scripts yarn-berry_4 yarn-berry_4.yarn-berry-fetcher
 
 set -eu -o pipefail