Merge pull request #198443 from gador/pgadmin-6.15
pgadmin4: 6.14 -> 6.15
This commit is contained in:
Mario Rodas
GitHub
commit
64dd5afe00
4 changed files with 133 additions and 11 deletions
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
let
|
||||
pname = "pgadmin";
|
||||
version = "6.14";
|
||||
version = "6.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz";
|
||||
sha256 = "sha256-M3Tu+69Gmc0FfqtGTtJ6j014QARd2efJ4dq0vK2IMr8=";
|
||||
sha256 = "sha256-S//Rfi8IiBo+lL0BCFVBw+hy2Tw37B349Gcpq2knqSM=";
|
||||
};
|
||||
|
||||
yarnDeps = mkYarnModules {
|
||||
|
|
@ -38,7 +38,6 @@ let
|
|||
passlib
|
||||
pytz
|
||||
simplejson
|
||||
six
|
||||
sqlparse
|
||||
wtforms
|
||||
flask-paranoid
|
||||
|
|
@ -75,7 +74,7 @@ let
|
|||
# keep the scope, as it is used throughout the derivation and tests
|
||||
# this also makes potential future overrides easier
|
||||
pythonPackages = python3.pkgs.overrideScope (final: prev: rec {
|
||||
# flask 2.2 is incompatible with pgadmin 6.14
|
||||
# flask 2.2 is incompatible with pgadmin 6.15
|
||||
# https://redmine.postgresql.org/issues/7651
|
||||
flask = prev.flask.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2.1.3";
|
||||
|
|
@ -84,7 +83,7 @@ let
|
|||
sha256 = "sha256-FZcuUBffBXXD1sCQuhaLbbkCWeYgrI1+qBOjlrrVtss=";
|
||||
};
|
||||
});
|
||||
# pgadmin 6.14 is incompatible with the major flask-security-too update to 5.0.x
|
||||
# pgadmin 6.15 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 {
|
||||
|
|
|
|||
|
|
@ -146,6 +146,8 @@
|
|||
"react-aspen": "^1.1.0",
|
||||
"react-checkbox-tree": "^1.7.2",
|
||||
"react-data-grid": "git+https://github.com/EnterpriseDB/react-data-grid.git/#200d2f5e02de694e3e9ffbe177c279bc40240fb8",
|
||||
"react-dnd": "^16.0.1",
|
||||
"react-dnd-html5-backend": "^16.0.1",
|
||||
"react-dom": "^17.0.1",
|
||||
"react-draggable": "^4.4.4",
|
||||
"react-dropzone": "^14.2.1",
|
||||
|
|
@ -168,7 +170,7 @@
|
|||
"underscore": "^1.13.1",
|
||||
"url-loader": "^1.1.2",
|
||||
"valid-filename": "^2.0.1",
|
||||
"webcabin-docker": "git+https://github.com/EnterpriseDB/wcDocker/#40d025e0d86ee3cf058a52e01d2042113f134cdd",
|
||||
"webcabin-docker": "git+https://github.com/EnterpriseDB/wcDocker/#b4d58f29b3a308ab555085ee444fa7010aa4b991",
|
||||
"wkx": "^0.5.0",
|
||||
"xterm": "^4.11.0",
|
||||
"xterm-addon-fit": "^0.5.0",
|
||||
|
|
|
|||
|
|
@ -1791,6 +1791,13 @@
|
|||
dependencies:
|
||||
regenerator-runtime "^0.13.4"
|
||||
|
||||
"@babel/runtime@^7.9.2":
|
||||
version "7.19.0"
|
||||
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.19.0.tgz#22b11c037b094d27a8a2504ea4dcff00f50e2259"
|
||||
integrity sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==
|
||||
dependencies:
|
||||
regenerator-runtime "^0.13.4"
|
||||
|
||||
"@babel/template@^7.12.13":
|
||||
version "7.14.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4"
|
||||
|
|
@ -2351,6 +2358,21 @@
|
|||
"@projectstorm/react-diagrams-defaults" "^6.6.1"
|
||||
"@projectstorm/react-diagrams-routing" "^6.6.1"
|
||||
|
||||
"@react-dnd/asap@^5.0.1":
|
||||
version "5.0.2"
|
||||
resolved "https://registry.yarnpkg.com/@react-dnd/asap/-/asap-5.0.2.tgz#1f81f124c1cd6f39511c11a881cfb0f715343488"
|
||||
integrity sha512-WLyfoHvxhs0V9U+GTsGilGgf2QsPl6ZZ44fnv0/b8T3nQyvzxidxsg/ZltbWssbsRDlYW8UKSQMTGotuTotZ6A==
|
||||
|
||||
"@react-dnd/invariant@^4.0.1":
|
||||
version "4.0.2"
|
||||
resolved "https://registry.yarnpkg.com/@react-dnd/invariant/-/invariant-4.0.2.tgz#b92edffca10a26466643349fac7cdfb8799769df"
|
||||
integrity sha512-xKCTqAK/FFauOM9Ta2pswIyT3D8AQlfrYdOi/toTPEhqCuAs1v5tcJ3Y08Izh1cJ5Jchwy9SeAXmMg6zrKs2iw==
|
||||
|
||||
"@react-dnd/shallowequal@^4.0.1":
|
||||
version "4.0.2"
|
||||
resolved "https://registry.yarnpkg.com/@react-dnd/shallowequal/-/shallowequal-4.0.2.tgz#d1b4befa423f692fa4abf1c79209702e7d8ae4b4"
|
||||
integrity sha512-/RVXdLvJxLg4QKvMoM5WlwNR9ViO9z8B/qPcc+C0Sa/teJY7QG7kJ441DwzOjMYEY7GmU4dj5EcGHIkKZiQZCA==
|
||||
|
||||
"@react-leaflet/core@^1.1.1":
|
||||
version "1.1.1"
|
||||
resolved "https://registry.yarnpkg.com/@react-leaflet/core/-/core-1.1.1.tgz#827fd05bb542cf874116176d8ef48d5b12163f81"
|
||||
|
|
@ -4902,6 +4924,15 @@ discontinuous-range@1.0.0:
|
|||
resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a"
|
||||
integrity sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ==
|
||||
|
||||
dnd-core@^16.0.1:
|
||||
version "16.0.1"
|
||||
resolved "https://registry.yarnpkg.com/dnd-core/-/dnd-core-16.0.1.tgz#a1c213ed08961f6bd1959a28bb76f1a868360d19"
|
||||
integrity sha512-HK294sl7tbw6F6IeuK16YSBUoorvHpY8RHO+9yFfaJyCDVb6n7PRcezrOEOa2SBCqiYpemh5Jx20ZcjKdFAVng==
|
||||
dependencies:
|
||||
"@react-dnd/asap" "^5.0.1"
|
||||
"@react-dnd/invariant" "^4.0.1"
|
||||
redux "^4.2.0"
|
||||
|
||||
doctrine@^2.1.0:
|
||||
version "2.1.0"
|
||||
resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
|
||||
|
|
@ -9521,6 +9552,24 @@ react-checkbox-tree@^1.7.2:
|
|||
dependencies:
|
||||
clsx "^1.1.1"
|
||||
|
||||
react-dnd-html5-backend@^16.0.1:
|
||||
version "16.0.1"
|
||||
resolved "https://registry.yarnpkg.com/react-dnd-html5-backend/-/react-dnd-html5-backend-16.0.1.tgz#87faef15845d512a23b3c08d29ecfd34871688b6"
|
||||
integrity sha512-Wu3dw5aDJmOGw8WjH1I1/yTH+vlXEL4vmjk5p+MHxP8HuHJS1lAGeIdG/hze1AvNeXWo/JgULV87LyQOr+r5jw==
|
||||
dependencies:
|
||||
dnd-core "^16.0.1"
|
||||
|
||||
react-dnd@^16.0.1:
|
||||
version "16.0.1"
|
||||
resolved "https://registry.yarnpkg.com/react-dnd/-/react-dnd-16.0.1.tgz#2442a3ec67892c60d40a1559eef45498ba26fa37"
|
||||
integrity sha512-QeoM/i73HHu2XF9aKksIUuamHPDvRglEwdHL4jsp784BgUuWcg6mzfxT0QDdQz8Wj0qyRKx2eMg8iZtWvU4E2Q==
|
||||
dependencies:
|
||||
"@react-dnd/invariant" "^4.0.1"
|
||||
"@react-dnd/shallowequal" "^4.0.1"
|
||||
dnd-core "^16.0.1"
|
||||
fast-deep-equal "^3.1.3"
|
||||
hoist-non-react-statics "^3.3.2"
|
||||
|
||||
react-dom@^16.6.3:
|
||||
version "16.14.0"
|
||||
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89"
|
||||
|
|
@ -9784,6 +9833,13 @@ redent@^4.0.0:
|
|||
indent-string "^5.0.0"
|
||||
strip-indent "^4.0.0"
|
||||
|
||||
redux@^4.2.0:
|
||||
version "4.2.0"
|
||||
resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.0.tgz#46f10d6e29b6666df758780437651eeb2b969f13"
|
||||
integrity sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA==
|
||||
dependencies:
|
||||
"@babel/runtime" "^7.9.2"
|
||||
|
||||
reflect.ownkeys@^0.2.0:
|
||||
version "0.2.0"
|
||||
resolved "https://registry.yarnpkg.com/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz#749aceec7f3fdf8b63f927a04809e90c5c0b3460"
|
||||
|
|
@ -11419,12 +11475,13 @@ watchpack@^2.2.0:
|
|||
glob-to-regexp "^0.4.1"
|
||||
graceful-fs "^4.1.2"
|
||||
|
||||
"webcabin-docker@git+https://github.com/EnterpriseDB/wcDocker/#40d025e0d86ee3cf058a52e01d2042113f134cdd":
|
||||
"webcabin-docker@git+https://github.com/EnterpriseDB/wcDocker/#b4d58f29b3a308ab555085ee444fa7010aa4b991":
|
||||
version "2.2.5"
|
||||
resolved "git+https://github.com/EnterpriseDB/wcDocker/#40d025e0d86ee3cf058a52e01d2042113f134cdd"
|
||||
resolved "git+https://github.com/EnterpriseDB/wcDocker/#b4d58f29b3a308ab555085ee444fa7010aa4b991"
|
||||
dependencies:
|
||||
"@fortawesome/fontawesome-free" "^5.14.0"
|
||||
FileSaver "^0.10.0"
|
||||
bootstrap "^4.3.1"
|
||||
jquery "^3.3.1"
|
||||
jquery-contextmenu "^2.6.4"
|
||||
|
||||
|
|
|
|||
|
|
@ -1609,6 +1609,14 @@
|
|||
sha512 = "dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA==";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_babel_runtime___runtime_7.19.0.tgz";
|
||||
path = fetchurl {
|
||||
name = "_babel_runtime___runtime_7.19.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.19.0.tgz";
|
||||
sha512 = "eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_babel_template___template_7.14.5.tgz";
|
||||
path = fetchurl {
|
||||
|
|
@ -2145,6 +2153,30 @@
|
|||
sha512 = "tLSXfEf/dGFUN8JCCRMrYyIBhhn+eVw24xQodmtcReJxQpKa31EWh9CmJ6UEg7xUnabMG9f2plOPyJqyFssGTA==";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_react_dnd_asap___asap_5.0.2.tgz";
|
||||
path = fetchurl {
|
||||
name = "_react_dnd_asap___asap_5.0.2.tgz";
|
||||
url = "https://registry.yarnpkg.com/@react-dnd/asap/-/asap-5.0.2.tgz";
|
||||
sha512 = "WLyfoHvxhs0V9U+GTsGilGgf2QsPl6ZZ44fnv0/b8T3nQyvzxidxsg/ZltbWssbsRDlYW8UKSQMTGotuTotZ6A==";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_react_dnd_invariant___invariant_4.0.2.tgz";
|
||||
path = fetchurl {
|
||||
name = "_react_dnd_invariant___invariant_4.0.2.tgz";
|
||||
url = "https://registry.yarnpkg.com/@react-dnd/invariant/-/invariant-4.0.2.tgz";
|
||||
sha512 = "xKCTqAK/FFauOM9Ta2pswIyT3D8AQlfrYdOi/toTPEhqCuAs1v5tcJ3Y08Izh1cJ5Jchwy9SeAXmMg6zrKs2iw==";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_react_dnd_shallowequal___shallowequal_4.0.2.tgz";
|
||||
path = fetchurl {
|
||||
name = "_react_dnd_shallowequal___shallowequal_4.0.2.tgz";
|
||||
url = "https://registry.yarnpkg.com/@react-dnd/shallowequal/-/shallowequal-4.0.2.tgz";
|
||||
sha512 = "/RVXdLvJxLg4QKvMoM5WlwNR9ViO9z8B/qPcc+C0Sa/teJY7QG7kJ441DwzOjMYEY7GmU4dj5EcGHIkKZiQZCA==";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_react_leaflet_core___core_1.1.1.tgz";
|
||||
path = fetchurl {
|
||||
|
|
@ -4833,6 +4865,14 @@
|
|||
sha512 = "c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ==";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "dnd_core___dnd_core_16.0.1.tgz";
|
||||
path = fetchurl {
|
||||
name = "dnd_core___dnd_core_16.0.1.tgz";
|
||||
url = "https://registry.yarnpkg.com/dnd-core/-/dnd-core-16.0.1.tgz";
|
||||
sha512 = "HK294sl7tbw6F6IeuK16YSBUoorvHpY8RHO+9yFfaJyCDVb6n7PRcezrOEOa2SBCqiYpemh5Jx20ZcjKdFAVng==";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "doctrine___doctrine_2.1.0.tgz";
|
||||
path = fetchurl {
|
||||
|
|
@ -8454,7 +8494,7 @@
|
|||
path = fetchurl {
|
||||
name = "moment_timezone___moment_timezone_0.5.37.tgz";
|
||||
url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.37.tgz";
|
||||
sha256 = "1w1sq8m21v1widzhy1dfrf2ngv9a5yhq06igjsjlpl23vxmfmfir";
|
||||
sha1 = "rfl/cZxORY/bEuK06HuL7J9O7x4=";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -10033,6 +10073,22 @@
|
|||
tar cf $out --mode u+w -C ${repo} .
|
||||
'';
|
||||
}
|
||||
{
|
||||
name = "react_dnd_html5_backend___react_dnd_html5_backend_16.0.1.tgz";
|
||||
path = fetchurl {
|
||||
name = "react_dnd_html5_backend___react_dnd_html5_backend_16.0.1.tgz";
|
||||
url = "https://registry.yarnpkg.com/react-dnd-html5-backend/-/react-dnd-html5-backend-16.0.1.tgz";
|
||||
sha512 = "Wu3dw5aDJmOGw8WjH1I1/yTH+vlXEL4vmjk5p+MHxP8HuHJS1lAGeIdG/hze1AvNeXWo/JgULV87LyQOr+r5jw==";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "react_dnd___react_dnd_16.0.1.tgz";
|
||||
path = fetchurl {
|
||||
name = "react_dnd___react_dnd_16.0.1.tgz";
|
||||
url = "https://registry.yarnpkg.com/react-dnd/-/react-dnd-16.0.1.tgz";
|
||||
sha512 = "QeoM/i73HHu2XF9aKksIUuamHPDvRglEwdHL4jsp784BgUuWcg6mzfxT0QDdQz8Wj0qyRKx2eMg8iZtWvU4E2Q==";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "react_dom___react_dom_16.14.0.tgz";
|
||||
path = fetchurl {
|
||||
|
|
@ -10297,6 +10353,14 @@
|
|||
sha512 = "tYkDkVVtYkSVhuQ4zBgfvciymHaeuel+zFKXShfDnFP5SyVEP7qo70Rf1jTOTCx3vGNAbnEi/xFkcfQVMIBWag==";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "redux___redux_4.2.0.tgz";
|
||||
path = fetchurl {
|
||||
name = "redux___redux_4.2.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/redux/-/redux-4.2.0.tgz";
|
||||
sha512 = "oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA==";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "reflect.ownkeys___reflect.ownkeys_0.2.0.tgz";
|
||||
path = fetchurl {
|
||||
|
|
@ -12239,8 +12303,8 @@
|
|||
let
|
||||
repo = fetchgit {
|
||||
url = "https://github.com/EnterpriseDB/wcDocker/";
|
||||
rev = "40d025e0d86ee3cf058a52e01d2042113f134cdd";
|
||||
sha256 = "0978f184lh2fkcxl6fjpn210vip8ci1plpdbsvd0ziz4b3zz8h45";
|
||||
rev = "b4d58f29b3a308ab555085ee444fa7010aa4b991";
|
||||
sha256 = "03hb9n6wkmj9dzs8fiv03krmy2kxhr1yqmqbrrza9jafbcbrap97";
|
||||
};
|
||||
in
|
||||
runCommand "wcDocker" { buildInputs = [gnutar]; } ''
|
||||
|
|
|
|||
Loading…
Reference in a new issue