Merge pull request #322989 from gador/pgadmin-8.9

pgadmin4: 8.8 -> 8.9
This commit is contained in:
h7x4 2024-07-02 18:07:26 +02:00 committed by GitHub
commit eeda342e3c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1235 additions and 1273 deletions

View File

@ -15,14 +15,14 @@
let
pname = "pgadmin";
version = "8.8";
yarnHash = "sha256-dBgbgZrjF1rNyN1Hp1nKiT6C6FVbYdbEZQgYbRKVsYI=";
version = "8.9";
yarnHash = "sha256-UEQ5gcc4n/XMW5kNol2gLiXUb9Ys75YMzWDXDiDIC9I=";
src = fetchFromGitHub {
owner = "pgadmin-org";
repo = "pgadmin4";
rev = "REL-${lib.versions.major version}_${lib.versions.minor version}";
hash = "sha256-203tuxtYOn1fD1m8BGL6rt5lDDr5V38ybPy+iwmZpkk=";
hash = "sha256-qxbY4gIXpp5U8RkzdYZUKJ7aTXvuXPGOGTKX41k1iyE=";
};
# keep the scope, as it is used throughout the derivation and tests
@ -77,7 +77,7 @@ pythonPackages.buildPythonApplication rec {
sed 's|*|0|g' -i requirements.txt
# remove packageManager from package.json so we can work without corepack
substituteInPlace web/package.json \
--replace-fail "\"packageManager\": \"yarn@3.6.4\"" "\"\": \"\""
--replace-fail "\"packageManager\": \"yarn@3.8.2\"" "\"\": \"\""
substituteInPlace pkg/pip/setup_pip.py \
--replace-fail "req = req.replace('psycopg[c]', 'psycopg[binary]')" "req = req"
${lib.optionalString (!server-mode) ''

File diff suppressed because it is too large Load Diff