pgadmin: 8.5 -> 8.6

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
This commit is contained in:
Florian Brandes 2024-05-08 14:03:51 +02:00
parent 43396e552a
commit 1ad23e2400
No known key found for this signature in database
GPG Key ID: 074048E893713170
2 changed files with 3079 additions and 3643 deletions

View File

@ -15,30 +15,19 @@
let let
pname = "pgadmin"; pname = "pgadmin";
version = "8.5"; version = "8.6";
yarnHash = "sha256-VLf8GRJ2IIcrfBqdgT2uZG3kOEt0pd7Cksm+tdrQogA="; yarnHash = "sha256-SDAU6goe5iu1SAcAsAEam2i+skZkG/hE9y3bGsKiFZ8=";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pgadmin-org"; owner = "pgadmin-org";
repo = "pgadmin4"; repo = "pgadmin4";
rev = "REL-${lib.versions.major version}_${lib.versions.minor version}"; rev = "REL-${lib.versions.major version}_${lib.versions.minor version}";
hash = "sha256-D/8tiVL2DwxvDiSqHeOF1P/yRRniZY39TyUfibrfAOo="; hash = "sha256-a370dh5IHInhcPA1LeveUIjalrymTsdyoXjBNNKwSTs=";
}; };
# keep the scope, as it is used throughout the derivation and tests # keep the scope, as it is used throughout the derivation and tests
# this also makes potential future overrides easier # this also makes potential future overrides easier
pythonPackages = python3.pkgs.overrideScope (final: prev: rec { pythonPackages = python3.pkgs.overrideScope (final: prev: rec { });
# Flask 5.4.3 introduces an CSRF error which makes it impossible to login
# So either we downgrade flask here or use "WTF_CSRF_ENABLED = false" in the
# module config to disable CSRF.
flask-security-too = prev.flask-security-too.overridePythonAttrs (oldAttrs: rec {
version = "5.4.1";
src = oldAttrs.src.override {
inherit version;
hash = "sha256-Ay7+gk+zuUlXtw0LDdsnvSa22z+yE6VR1guu9QmiFvw=";
};
});
});
offlineCache = fetchYarnDeps { offlineCache = fetchYarnDeps {
yarnLock = ./yarn.lock; yarnLock = ./yarn.lock;
@ -159,7 +148,6 @@ pythonPackages.buildPythonApplication rec {
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = with pythonPackages; [
flask flask
flask-gravatar
flask-login flask-login
flask-mail flask-mail
flask-migrate flask-migrate
@ -209,6 +197,7 @@ pythonPackages.buildPythonApplication rec {
typer typer
rich rich
jsonformatter jsonformatter
libgravatar
]; ];
passthru.tests = { passthru.tests = {

File diff suppressed because it is too large Load Diff