JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #222346 from gador/pgadmin-6.21

Browse Source 
pgadmin4: 6.20 -> 6.21
This commit is contained in:
Nick Cao 2023-03-22 16:14:50 +08:00 committed by GitHub
commit 7b0349500e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/admin/pgadmin/default.nix
View File

@ -12,11 +12,11 @@
let
pname = "pgadmin";
version = "6.20";
version = "6.21";
src = fetchurl {
url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz";
hash = "sha256-6aQvg98LymZGAgAcNX5Xhw/aRdE5h4HOCPS+kQnkstU=";
hash = "sha256-9ErMhxzixyiwcwcduLP63JfM3rNy0W/3w0b+BbQAjUA=";
};
yarnDeps = mkYarnModules {
@ -53,7 +53,7 @@ let
};
propagatedBuildInputs = [ prev.pytz ];
});
# pgadmin 6.20 is incompatible with flask 2.2
# pgadmin 6.21 is incompatible with flask 2.2
# https://redmine.postgresql.org/issues/7651
flask = prev.flask.overridePythonAttrs (oldAttrs: rec {
version = "2.1.3";
@ -87,7 +87,7 @@ let
hash = "sha256-NP5cb+4PabUOMPgaO36haqFJKncf6a0JdNFkYQwJpsk=";
};
});
# pgadmin 6.20 is incompatible with the major flask-security-too update to 5.0.x
# pgadmin 6.21 is incompatible with the major flask-security-too update to 5.0.x
flask-security-too = prev.flask-security-too.overridePythonAttrs (oldAttrs: rec {
version = "4.1.5";
src = oldAttrs.src.override {

1
pkgs/tools/admin/pgadmin/package.json
View File

@ -124,7 +124,6 @@
"jquery": "^3.6.0",
"json-bignumber": "^1.0.1",
"jsoneditor": "^9.5.4",
"jsoneditor-react": "^3.1.1",
"karma-coverage": "^2.0.3",
"leaflet": "^1.5.1",
"lodash": "4.*",

7
pkgs/tools/admin/pgadmin/yarn.lock
View File

@ -6235,13 +6235,6 @@ json5@^2.1.2, json5@^2.2.1:
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
integrity "sha1-eM1vGhm9wStz21rQxh79ZsHikoM= sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
jsoneditor-react@^3.1.1:
version "3.1.2"
resolved "https://registry.yarnpkg.com/jsoneditor-react/-/jsoneditor-react-3.1.2.tgz#bc36356ac5ecb0d8f88d49a5ccbeecdd7f996164"
integrity sha512-XqU8BMdIhrlS5HUnn7rGhgZw315bdJGQrf6NG5UH40FSw2xNirQrxnM05aeAplHkp8FNkzN2WX0tfvEWdl2UUA==
dependencies:
prop-types "^15.7.2"
jsoneditor@^9.5.4:
version "9.9.2"
resolved "https://registry.yarnpkg.com/jsoneditor/-/jsoneditor-9.9.2.tgz#176112f71acbf37e977aae8656a17bc33a7a4269"

8
pkgs/tools/admin/pgadmin/yarn.nix
View File

@ -6529,14 +6529,6 @@
sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==";
};
}
{
name = "jsoneditor_react___jsoneditor_react_3.1.2.tgz";
path = fetchurl {
name = "jsoneditor_react___jsoneditor_react_3.1.2.tgz";
url = "https://registry.yarnpkg.com/jsoneditor-react/-/jsoneditor-react-3.1.2.tgz";
sha512 = "XqU8BMdIhrlS5HUnn7rGhgZw315bdJGQrf6NG5UH40FSw2xNirQrxnM05aeAplHkp8FNkzN2WX0tfvEWdl2UUA==";
};
}
{
name = "jsoneditor___jsoneditor_9.9.2.tgz";
path = fetchurl {