cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

pgadmin4: 6.18 -> 6.19

Browse source 
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
This commit is contained in:
Florian Brandes 2023-01-26 15:13:04 +01:00
parent 1dac9db7fd
commit cfc77dc410
6 changed files with 164 additions and 294 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

218
nixos/tests/pgadmin4.nix
View file

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], ... }: import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], ... }:
/* /*
This test suite replaces the typical pytestCheckHook function in python This test suite replaces the typical pytestCheckHook function in python
packages. Pgadmin4 test suite needs a running and configured postgresql packages. Pgadmin4 test suite needs a running and configured postgresql
server. This is why this test exists. server. This is why this test exists.
@ -17,117 +17,123 @@ import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], ..
*/ */
let let
pgadmin4SrcDir = "/pgadmin"; pgadmin4SrcDir = "/pgadmin";
pgadmin4Dir = "/var/lib/pgadmin"; pgadmin4Dir = "/var/lib/pgadmin";
pgadmin4LogDir = "/var/log/pgadmin"; pgadmin4LogDir = "/var/log/pgadmin";
in in
{ {
name = "pgadmin4"; name = "pgadmin4";
meta.maintainers = with lib.maintainers; [ gador ]; meta.maintainers = with lib.maintainers; [ gador ];
nodes.machine = { pkgs, ... }: { nodes.machine = { pkgs, ... }: {
imports = [ ./common/x11.nix ]; imports = [ ./common/x11.nix ];
# needed because pgadmin 6.8 will fail, if those dependencies get updated # needed because pgadmin 6.8 will fail, if those dependencies get updated
nixpkgs.overlays = [ nixpkgs.overlays = [
(self: super: { (self: super: {
pythonPackages = pythonEnv; pythonPackages = pythonEnv;
}) })
];
environment.systemPackages = with pkgs; [
pgadmin4
postgresql
chromedriver
chromium
# include the same packages as in pgadmin minus speaklater3
(python3.withPackages
(ps: buildDeps ++
[
# test suite package requirements
pythonPackages.testscenarios
pythonPackages.selenium
])
)
];
services.postgresql = {
enable = true;
authentication = ''
host all all localhost trust
'';
ensureUsers = [
{
name = "postgres";
ensurePermissions = {
"DATABASE \"postgres\"" = "ALL PRIVILEGES";
};
}
]; ];
environment.systemPackages = with pkgs; [
pgadmin4
postgresql
chromedriver
chromium
# include the same packages as in pgadmin minus speaklater3
(python3.withPackages
(ps: buildDeps ++
[
# test suite package requirements
pythonPackages.testscenarios
pythonPackages.selenium
])
)
];
services.postgresql = {
enable = true;
authentication = ''
host all all localhost trust
'';
ensureUsers = [
{
name = "postgres";
ensurePermissions = {
"DATABASE \"postgres\"" = "ALL PRIVILEGES";
};
}
];
};
}; };
};
testScript = '' testScript = ''
machine.wait_for_unit("postgresql") machine.wait_for_unit("postgresql")
# pgadmin4 needs its data and log directories # pgadmin4 needs its data and log directories
machine.succeed(
"mkdir -p ${pgadmin4Dir} \
&& mkdir -p ${pgadmin4LogDir} \
&& mkdir -p ${pgadmin4SrcDir}"
)
machine.succeed(
"tar xvzf ${pkgs.pgadmin4.src} -C ${pgadmin4SrcDir}"
)
machine.wait_for_file("${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/README.md")
# set paths and config for tests
# also ensure Server Mode is set to false, which will automatically exclude some unnecessary tests.
# see https://github.com/pgadmin-org/pgadmin4/blob/fd1c26408bbf154fa455a49ee5c12895933833a3/web/regression/runtests.py#L217-L226
machine.succeed(
"cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version} \
&& cp -v web/regression/test_config.json.in web/regression/test_config.json \
&& sed -i 's|PostgreSQL 9.4|PostgreSQL|' web/regression/test_config.json \
&& sed -i 's|/opt/PostgreSQL/9.4/bin/|${pkgs.postgresql}/bin|' web/regression/test_config.json \
&& sed -i 's|\"headless_chrome\": false|\"headless_chrome\": true|' web/regression/test_config.json \
&& sed -i 's|builtins.SERVER_MODE = None|builtins.SERVER_MODE = False|' web/regression/runtests.py"
)
# adapt chrome config to run within a sandbox without GUI
# see https://stackoverflow.com/questions/50642308/webdriverexception-unknown-error-devtoolsactiveport-file-doesnt-exist-while-t#50642913
# add chrome binary path. use spaces to satisfy python indention (tabs throw an error)
machine.succeed(
"cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version} \
&& sed -i '\|options.add_argument(\"--disable-infobars\")|a \ \ \ \ \ \ \ \ options.binary_location = \"${pkgs.chromium}/bin/chromium\"' web/regression/runtests.py \
&& sed -i '\|options.add_argument(\"--no-sandbox\")|a \ \ \ \ \ \ \ \ options.add_argument(\"--headless\")' web/regression/runtests.py \
&& sed -i '\|options.add_argument(\"--disable-infobars\")|a \ \ \ \ \ \ \ \ options.add_argument(\"--disable-dev-shm-usage\")' web/regression/runtests.py \
&& sed -i 's|(chrome_options=options)|(executable_path=\"${pkgs.chromedriver}/bin/chromedriver\", chrome_options=options)|' web/regression/runtests.py \
&& sed -i 's|driver_local.maximize_window()||' web/regression/runtests.py"
)
# don't bother to test kerberos authentication
excluded_tests = [ "browser.tests.test_kerberos_with_mocking",
]
with subtest("run browser test"):
machine.succeed(
'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
&& python regression/runtests.py \
--pkg browser \
--exclude ' + ','.join(excluded_tests)
)
with subtest("run resql test"):
machine.succeed( machine.succeed(
"mkdir -p ${pgadmin4Dir} \ 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
&& mkdir -p ${pgadmin4LogDir} \ && python regression/runtests.py --pkg resql'
&& mkdir -p ${pgadmin4SrcDir}"
) )
machine.succeed( # fontconfig is necessary for chromium to run
"tar xvzf ${pkgs.pgadmin4.src} -C ${pgadmin4SrcDir}" # https://github.com/NixOS/nixpkgs/issues/136207
) # also, the feature_tests require Server Mode = True
with subtest("run feature test"):
machine.wait_for_file("${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/README.md") machine.succeed(
'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
# set paths and config for tests && export FONTCONFIG_FILE=${pkgs.makeFontsConf { fontDirectories = [];}} \
machine.succeed( && sed -i \'s|builtins.SERVER_MODE = False|builtins.SERVER_MODE = True|\' regression/runtests.py \
"cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version} \ && python regression/runtests.py --pkg feature_tests'
&& cp -v web/regression/test_config.json.in web/regression/test_config.json \ )
&& sed -i 's|PostgreSQL 9.4|PostgreSQL|' web/regression/test_config.json \ '';
&& sed -i 's|/opt/PostgreSQL/9.4/bin/|${pkgs.postgresql}/bin|' web/regression/test_config.json \ })
&& sed -i 's|\"headless_chrome\": false|\"headless_chrome\": true|' web/regression/test_config.json"
)
# adapt chrome config to run within a sandbox without GUI
# see https://stackoverflow.com/questions/50642308/webdriverexception-unknown-error-devtoolsactiveport-file-doesnt-exist-while-t#50642913
# add chrome binary path. use spaces to satisfy python indention (tabs throw an error)
# this works for selenium 3 (currently used), but will need to be updated
# to work with "from selenium.webdriver.chrome.service import Service" in selenium 4
machine.succeed(
"cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version} \
&& sed -i '\|options.add_argument(\"--disable-infobars\")|a \ \ \ \ \ \ \ \ options.binary_location = \"${pkgs.chromium}/bin/chromium\"' web/regression/runtests.py \
&& sed -i '\|options.add_argument(\"--no-sandbox\")|a \ \ \ \ \ \ \ \ options.add_argument(\"--headless\")' web/regression/runtests.py \
&& sed -i '\|options.add_argument(\"--disable-infobars\")|a \ \ \ \ \ \ \ \ options.add_argument(\"--disable-dev-shm-usage\")' web/regression/runtests.py \
&& sed -i 's|(chrome_options=options)|(executable_path=\"${pkgs.chromedriver}/bin/chromedriver\", chrome_options=options)|' web/regression/runtests.py \
&& sed -i 's|driver_local.maximize_window()||' web/regression/runtests.py"
)
# Don't bother to test LDAP or kerberos authentication
with subtest("run browser test"):
machine.succeed(
'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
&& python regression/runtests.py \
--pkg browser \
--exclude browser.tests.test_ldap_login.LDAPLoginTestCase,browser.tests.test_ldap_login,browser.tests.test_kerberos_with_mocking'
)
# fontconfig is necessary for chromium to run
# https://github.com/NixOS/nixpkgs/issues/136207
with subtest("run feature test"):
machine.succeed(
'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
&& export FONTCONFIG_FILE=${pkgs.makeFontsConf { fontDirectories = [];}} \
&& python regression/runtests.py --pkg feature_tests'
)
with subtest("run resql test"):
machine.succeed(
'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
&& python regression/runtests.py --pkg resql'
)
'';
})

9
pkgs/tools/admin/pgadmin/default.nix
View file

@ -11,11 +11,11 @@
let let
pname = "pgadmin"; pname = "pgadmin";
version = "6.18"; version = "6.19";
src = fetchurl { src = fetchurl {
url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz"; url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz";
sha256 = "sha256-qqilmJLpJ3XNd8dwk7bDAAPxt8sou5zydFMPcJGcGoo="; sha256 = "sha256-xHvdqVpNU9ZzTA6Xl2Bv044l6Tbvf4fjqyz4TmS9gmI=";
}; };
yarnDeps = mkYarnModules { yarnDeps = mkYarnModules {
@ -70,6 +70,9 @@ let
azure-mgmt-rdbms azure-mgmt-rdbms
azure-mgmt-resource azure-mgmt-resource
azure-identity azure-identity
sphinxcontrib-youtube
dnspython
greenlet
]; ];
# keep the scope, as it is used throughout the derivation and tests # keep the scope, as it is used throughout the derivation and tests
@ -104,7 +107,7 @@ let
hash = "sha256-K9pEtD58rLFdTgX/PMH4vJeTbMRkYjQkECv8LDXpWRI="; hash = "sha256-K9pEtD58rLFdTgX/PMH4vJeTbMRkYjQkECv8LDXpWRI=";
}; };
}); });
# pgadmin 6.18 is incompatible with the major flask-security-too update to 5.0.x # pgadmin 6.19 is incompatible with the major flask-security-too update to 5.0.x
flask-security-too = prev.flask-security-too.overridePythonAttrs (oldAttrs: rec { flask-security-too = prev.flask-security-too.overridePythonAttrs (oldAttrs: rec {
version = "4.1.5"; version = "4.1.5";
src = oldAttrs.src.override { src = oldAttrs.src.override {

8
pkgs/tools/admin/pgadmin/package.json
View file

@ -112,7 +112,6 @@
"classnames": "^2.2.6", "classnames": "^2.2.6",
"closest": "^0.0.1", "closest": "^0.0.1",
"codemirror": "^5.59.2", "codemirror": "^5.59.2",
"context-menu": "^2.0.0",
"convert-units": "^2.3.4", "convert-units": "^2.3.4",
"cssnano": "^5.0.2", "cssnano": "^5.0.2",
"dagre": "^0.8.4", "dagre": "^0.8.4",
@ -123,8 +122,6 @@
"insert-if": "^1.1.0", "insert-if": "^1.1.0",
"ip-address": "^7.1.0", "ip-address": "^7.1.0",
"jquery": "^3.6.0", "jquery": "^3.6.0",
"jquery-contextmenu": "^2.9.2",
"jquery-ui": "^1.13.2",
"json-bignumber": "^1.0.1", "json-bignumber": "^1.0.1",
"jsoneditor": "^9.5.4", "jsoneditor": "^9.5.4",
"jsoneditor-react": "^3.1.1", "jsoneditor-react": "^3.1.1",
@ -140,14 +137,13 @@
"path-fx": "^2.0.0", "path-fx": "^2.0.0",
"pathfinding": "^0.4.18", "pathfinding": "^0.4.18",
"paths-js": "^0.4.9", "paths-js": "^0.4.9",
"pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#96ceb7f27f43660a804e61d23a76aeb9aa188bb6",
"postcss": "^8.2.15", "postcss": "^8.2.15",
"raf": "^3.4.1", "raf": "^3.4.1",
"rc-dock": "^3.2.9", "rc-dock": "^3.2.9",
"react": "^17.0.1", "react": "^17.0.1",
"react-aspen": "^1.1.0", "react-aspen": "^1.1.0",
"react-checkbox-tree": "^1.7.2", "react-checkbox-tree": "^1.7.2",
"react-data-grid": "git+https://github.com/EnterpriseDB/react-data-grid.git/#200d2f5e02de694e3e9ffbe177c279bc40240fb8", "react-data-grid": "git+https://github.com/pgadmin-org/react-data-grid.git/#200d2f5e02de694e3e9ffbe177c279bc40240fb8",
"react-dnd": "^16.0.1", "react-dnd": "^16.0.1",
"react-dnd-html5-backend": "^16.0.1", "react-dnd-html5-backend": "^16.0.1",
"react-dom": "^17.0.1", "react-dom": "^17.0.1",
@ -169,7 +165,7 @@
"tempusdominus-bootstrap-4": "^5.1.2", "tempusdominus-bootstrap-4": "^5.1.2",
"tempusdominus-core": "^5.19.3", "tempusdominus-core": "^5.19.3",
"valid-filename": "^2.0.1", "valid-filename": "^2.0.1",
"webcabin-docker": "git+https://github.com/EnterpriseDB/wcDocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8", "webcabin-docker": "git+https://github.com/pgadmin-org/wcdocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8",
"wkx": "^0.5.0", "wkx": "^0.5.0",
"xterm": "^4.11.0", "xterm": "^4.11.0",
"xterm-addon-fit": "^0.5.0", "xterm-addon-fit": "^0.5.0",

95
pkgs/tools/admin/pgadmin/yarn.lock
View file

@ -2340,7 +2340,7 @@ aspen-core@^1.0.4:
p-series "^1.1.0" p-series "^1.1.0"
path-fx "^2.1.1" path-fx "^2.1.1"
aspen-decorations@^1.0.2, aspen-decorations@^1.1.1: aspen-decorations@^1.0.2:
version "1.1.1" version "1.1.1"
resolved "https://registry.yarnpkg.com/aspen-decorations/-/aspen-decorations-1.1.1.tgz#7d0ca740efab1aa4fd91a1f3db81ac29186607a3" resolved "https://registry.yarnpkg.com/aspen-decorations/-/aspen-decorations-1.1.1.tgz#7d0ca740efab1aa4fd91a1f3db81ac29186607a3"
integrity sha512-Ej2tv0Gz3bnhkNCyzzjDeG2V5vd49T30ca0SKywHuLA5RKrZ1NutEyZnUYku4WmUV1/TdpHRiSJ759nbZK4xtQ== integrity sha512-Ej2tv0Gz3bnhkNCyzzjDeG2V5vd49T30ca0SKywHuLA5RKrZ1NutEyZnUYku4WmUV1/TdpHRiSJ759nbZK4xtQ==
@ -3385,13 +3385,6 @@ content-type@~1.0.4:
resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
context-menu@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/context-menu/-/context-menu-2.0.0.tgz#565f13210248e3442700e6b1a2d63406f2b08552"
integrity sha512-VQrkvcJDevuq+sde0QADRLOdIRpa4a1ti4knstrPILDLfWU/RB4ZIGpj32Chh/mURjrbi0CoLT1eonr3X86Khg==
dependencies:
tiny-emitter "^2.0.2"
convert-source-map@^1.5.0, convert-source-map@^1.7.0, convert-source-map@^1.8.0: convert-source-map@^1.5.0, convert-source-map@^1.7.0, convert-source-map@^1.8.0:
version "1.9.0" version "1.9.0"
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
@ -6133,21 +6126,14 @@ jmespath@^0.16.0:
resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.16.0.tgz#b15b0a85dfd4d930d43e69ed605943c802785076" resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.16.0.tgz#b15b0a85dfd4d930d43e69ed605943c802785076"
integrity sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw== integrity sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw==
jquery-contextmenu@^2.6.4, jquery-contextmenu@^2.9.2: jquery-contextmenu@^2.6.4:
version "2.9.2" version "2.9.2"
resolved "https://registry.yarnpkg.com/jquery-contextmenu/-/jquery-contextmenu-2.9.2.tgz#f9dc362e45871dda2e50fa45de2243e917446ced" resolved "https://registry.yarnpkg.com/jquery-contextmenu/-/jquery-contextmenu-2.9.2.tgz#f9dc362e45871dda2e50fa45de2243e917446ced"
integrity sha512-6S6sH/08owDStC/7zNwcN366yR0ydX6PmMB0RnjLRQOp7Nc/rqwEHglshfHrrw2kdTev97GXwRXrayDUmToIOw== integrity sha512-6S6sH/08owDStC/7zNwcN366yR0ydX6PmMB0RnjLRQOp7Nc/rqwEHglshfHrrw2kdTev97GXwRXrayDUmToIOw==
dependencies: dependencies:
jquery "^3.5.0" jquery "^3.5.0"
jquery-ui@^1.13.2: "jquery@>=1.7.1 <4.0.0", jquery@^3.3.1, jquery@^3.5.0, jquery@^3.6.0:
version "1.13.2"
resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.2.tgz#de03580ae6604773602f8d786ad1abfb75232034"
integrity sha512-wBZPnqWs5GaYJmo1Jj0k/mrSkzdQzKDwhXNtHKcBdAcKVxMM3KNYFq+iJ2i1rwiG53Z8M4mTn3Qxrm17uH1D4Q==
dependencies:
jquery ">=1.8.0 <4.0.0"
"jquery@>=1.7.1 <4.0.0", "jquery@>=1.8.0 <4.0.0", jquery@^3.3.1, jquery@^3.5.0, jquery@^3.6.0:
version "3.6.1" version "3.6.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.1.tgz#fab0408f8b45fc19f956205773b62b292c147a16" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.1.tgz#fab0408f8b45fc19f956205773b62b292c147a16"
integrity sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw== integrity sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==
@ -6238,16 +6224,16 @@ json-stable-stringify-without-jsonify@^1.0.1:
integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
json5@^1.0.1: json5@^1.0.1:
version "1.0.1" version "1.0.2"
resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
dependencies: dependencies:
minimist "^1.2.0" minimist "^1.2.0"
json5@^2.1.2, json5@^2.2.1: json5@^2.1.2, json5@^2.2.1:
version "2.2.1" version "2.2.3"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== integrity "sha1-eM1vGhm9wStz21rQxh79ZsHikoM= sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
jsoneditor-react@^3.1.1: jsoneditor-react@^3.1.1:
version "3.1.2" version "3.1.2"
@ -7831,27 +7817,6 @@ performance-now@^2.1.0:
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow== integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
"pgadmin4-tree@git+https://github.com/EnterpriseDB/pgadmin4-treeview/#96ceb7f27f43660a804e61d23a76aeb9aa188bb6":
version "1.0.0"
resolved "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#96ceb7f27f43660a804e61d23a76aeb9aa188bb6"
dependencies:
"@types/classnames" "^2.2.6"
"@types/react" "^16.7.18"
"@types/react-dom" "^16.0.11"
aspen-decorations "^1.1.1"
browserfs "^1.4.3"
classnames "^2.2.6"
context-menu "^2.0.0"
insert-if "^1.1.0"
lodash "4.*"
notificar "^1.0.1"
path-fx "^2.0.0"
react "^16.6.3"
react-aspen "^1.2.0"
react-dom "^16.6.3"
react-virtualized-auto-sizer "^1.0.6"
valid-filename "^2.0.1"
picocolors@^1.0.0: picocolors@^1.0.0:
version "1.0.0" version "1.0.0"
resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
@ -8531,7 +8496,7 @@ re-resizable@6.9.6:
dependencies: dependencies:
fast-memoize "^2.5.1" fast-memoize "^2.5.1"
react-aspen@^1.1.0, react-aspen@^1.2.0: react-aspen@^1.1.0:
version "1.2.0" version "1.2.0"
resolved "https://registry.yarnpkg.com/react-aspen/-/react-aspen-1.2.0.tgz#375fa82a8db627542fc8b9e6e421baa49a65ab95" resolved "https://registry.yarnpkg.com/react-aspen/-/react-aspen-1.2.0.tgz#375fa82a8db627542fc8b9e6e421baa49a65ab95"
integrity sha512-w+vUn4ScCzcxDB5xEsKIuIkUnySEQXlp/zqPFChWEpYG12mPO7h7z/LWuK2QXUoDbIP96Fcf1+UAI9I/cstPqg== integrity sha512-w+vUn4ScCzcxDB5xEsKIuIkUnySEQXlp/zqPFChWEpYG12mPO7h7z/LWuK2QXUoDbIP96Fcf1+UAI9I/cstPqg==
@ -8552,9 +8517,9 @@ react-checkbox-tree@^1.7.2:
nanoid "^3.0.0" nanoid "^3.0.0"
prop-types "^15.5.8" prop-types "^15.5.8"
"react-data-grid@git+https://github.com/EnterpriseDB/react-data-grid.git/#200d2f5e02de694e3e9ffbe177c279bc40240fb8": "react-data-grid@git+https://github.com/pgadmin-org/react-data-grid.git/#200d2f5e02de694e3e9ffbe177c279bc40240fb8":
version "7.0.0-beta.14" version "7.0.0-beta.14"
resolved "git+https://github.com/EnterpriseDB/react-data-grid.git/#200d2f5e02de694e3e9ffbe177c279bc40240fb8" resolved "git+https://github.com/pgadmin-org/react-data-grid.git/#200d2f5e02de694e3e9ffbe177c279bc40240fb8"
dependencies: dependencies:
clsx "^1.1.1" clsx "^1.1.1"
@ -8576,16 +8541,6 @@ react-dnd@^16.0.1:
fast-deep-equal "^3.1.3" fast-deep-equal "^3.1.3"
hoist-non-react-statics "^3.3.2" 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"
integrity sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.2"
scheduler "^0.19.1"
react-dom@^17.0.1: react-dom@^17.0.1:
version "17.0.2" version "17.0.2"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23"
@ -8747,15 +8702,6 @@ react-window@^1.3.1, react-window@^1.8.5:
"@babel/runtime" "^7.0.0" "@babel/runtime" "^7.0.0"
memoize-one ">=3.1.1 <6" memoize-one ">=3.1.1 <6"
react@^16.6.3:
version "16.14.0"
resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"
integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.2"
react@^17.0.1: react@^17.0.1:
version "17.0.2" version "17.0.2"
resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
@ -9117,14 +9063,6 @@ sax@^1.2.4:
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
scheduler@^0.19.1:
version "0.19.1"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"
integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
scheduler@^0.20.2: scheduler@^0.20.2:
version "0.20.2" version "0.20.2"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91" resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91"
@ -9997,11 +9935,6 @@ timers-browserify@^1.0.1:
dependencies: dependencies:
process "~0.11.0" process "~0.11.0"
tiny-emitter@^2.0.2:
version "2.1.0"
resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==
tiny-warning@^1.0.2: tiny-warning@^1.0.2:
version "1.0.3" version "1.0.3"
resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
@ -10404,9 +10337,9 @@ watchpack@^2.4.0:
glob-to-regexp "^0.4.1" glob-to-regexp "^0.4.1"
graceful-fs "^4.1.2" graceful-fs "^4.1.2"
"webcabin-docker@git+https://github.com/EnterpriseDB/wcDocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8": "webcabin-docker@git+https://github.com/pgadmin-org/wcdocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8":
version "2.2.5" version "2.2.5"
resolved "git+https://github.com/EnterpriseDB/wcDocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8" resolved "git+https://github.com/pgadmin-org/wcdocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8"
dependencies: dependencies:
"@fortawesome/fontawesome-free" "^5.14.0" "@fortawesome/fontawesome-free" "^5.14.0"
FileSaver "^0.10.0" FileSaver "^0.10.0"

126
pkgs/tools/admin/pgadmin/yarn.nix
View file

@ -3433,14 +3433,6 @@
sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==";
}; };
} }
{
name = "context_menu___context_menu_2.0.0.tgz";
path = fetchurl {
name = "context_menu___context_menu_2.0.0.tgz";
url = "https://registry.yarnpkg.com/context-menu/-/context-menu-2.0.0.tgz";
sha512 = "VQrkvcJDevuq+sde0QADRLOdIRpa4a1ti4knstrPILDLfWU/RB4ZIGpj32Chh/mURjrbi0CoLT1eonr3X86Khg==";
};
}
{ {
name = "convert_source_map___convert_source_map_1.9.0.tgz"; name = "convert_source_map___convert_source_map_1.9.0.tgz";
path = fetchurl { path = fetchurl {
@ -6385,14 +6377,6 @@
sha512 = "6S6sH/08owDStC/7zNwcN366yR0ydX6PmMB0RnjLRQOp7Nc/rqwEHglshfHrrw2kdTev97GXwRXrayDUmToIOw=="; sha512 = "6S6sH/08owDStC/7zNwcN366yR0ydX6PmMB0RnjLRQOp7Nc/rqwEHglshfHrrw2kdTev97GXwRXrayDUmToIOw==";
}; };
} }
{
name = "jquery_ui___jquery_ui_1.13.2.tgz";
path = fetchurl {
name = "jquery_ui___jquery_ui_1.13.2.tgz";
url = "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.2.tgz";
sha512 = "wBZPnqWs5GaYJmo1Jj0k/mrSkzdQzKDwhXNtHKcBdAcKVxMM3KNYFq+iJ2i1rwiG53Z8M4mTn3Qxrm17uH1D4Q==";
};
}
{ {
name = "jquery___jquery_3.6.1.tgz"; name = "jquery___jquery_3.6.1.tgz";
path = fetchurl { path = fetchurl {
@ -6530,19 +6514,19 @@
}; };
} }
{ {
name = "json5___json5_1.0.1.tgz"; name = "json5___json5_1.0.2.tgz";
path = fetchurl { path = fetchurl {
name = "json5___json5_1.0.1.tgz"; name = "json5___json5_1.0.2.tgz";
url = "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz"; url = "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz";
sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; sha512 = "g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==";
}; };
} }
{ {
name = "json5___json5_2.2.1.tgz"; name = "json5___json5_2.2.3.tgz";
path = fetchurl { path = fetchurl {
name = "json5___json5_2.2.1.tgz"; name = "json5___json5_2.2.3.tgz";
url = "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz"; url = "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz";
sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="; sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==";
}; };
} }
{ {
@ -8361,22 +8345,6 @@
sha512 = "7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="; sha512 = "7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==";
}; };
} }
{
name = "pgadmin4-treeview";
path =
let
repo = fetchgit {
url = "https://github.com/EnterpriseDB/pgadmin4-treeview/";
rev = "96ceb7f27f43660a804e61d23a76aeb9aa188bb6";
sha256 = "1hvr7arywz8rql19ma6w6lj5hrfn8xr4cyiia4bw5l8d061ak1gj";
};
in
runCommand "pgadmin4-treeview" { buildInputs = [gnutar]; } ''
# Set u+w because tar-fs can't unpack archives with read-only dirs
# https://github.com/mafintosh/tar-fs/issues/79
tar cf $out --mode u+w -C ${repo} .
'';
}
{ {
name = "picocolors___picocolors_1.0.0.tgz"; name = "picocolors___picocolors_1.0.0.tgz";
path = fetchurl { path = fetchurl {
@ -9148,18 +9116,16 @@
{ {
name = "react-data-grid.git"; name = "react-data-grid.git";
path = path =
let let repo = fetchgit {
repo = fetchgit { url = "https://github.com/pgadmin-org/react-data-grid.git/";
url = "https://github.com/EnterpriseDB/react-data-grid.git/"; rev = "200d2f5e02de694e3e9ffbe177c279bc40240fb8";
rev = "200d2f5e02de694e3e9ffbe177c279bc40240fb8"; sha256 = "0s4k8s8ackr5lrvhv7ljbhd90679wh34p2wv71xqn8yy1ykjwm15";
sha256 = "0s4k8s8ackr5lrvhv7ljbhd90679wh34p2wv71xqn8yy1ykjwm15"; };
}; in runCommand "react-data-grid.git" { buildInputs = [gnutar]; } ''
in # Set u+w because tar-fs can't unpack archives with read-only dirs
runCommand "react-data-grid.git" { buildInputs = [gnutar]; } '' # https://github.com/mafintosh/tar-fs/issues/79
# Set u+w because tar-fs can't unpack archives with read-only dirs tar cf $out --mode u+w -C ${repo} .
# https://github.com/mafintosh/tar-fs/issues/79 '';
tar cf $out --mode u+w -C ${repo} .
'';
} }
{ {
name = "react_dnd_html5_backend___react_dnd_html5_backend_16.0.1.tgz"; name = "react_dnd_html5_backend___react_dnd_html5_backend_16.0.1.tgz";
@ -9177,14 +9143,6 @@
sha512 = "QeoM/i73HHu2XF9aKksIUuamHPDvRglEwdHL4jsp784BgUuWcg6mzfxT0QDdQz8Wj0qyRKx2eMg8iZtWvU4E2Q=="; sha512 = "QeoM/i73HHu2XF9aKksIUuamHPDvRglEwdHL4jsp784BgUuWcg6mzfxT0QDdQz8Wj0qyRKx2eMg8iZtWvU4E2Q==";
}; };
} }
{
name = "react_dom___react_dom_16.14.0.tgz";
path = fetchurl {
name = "react_dom___react_dom_16.14.0.tgz";
url = "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz";
sha512 = "1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==";
};
}
{ {
name = "react_dom___react_dom_17.0.2.tgz"; name = "react_dom___react_dom_17.0.2.tgz";
path = fetchurl { path = fetchurl {
@ -9361,14 +9319,6 @@
sha512 = "D4IiBeRtGXziZ1n0XklnFGu7h9gU684zepqyKzgPNzrsrk7xOCxni+TCckjg2Nr/DiaEEGVVmnhYSlT2rB47dQ=="; sha512 = "D4IiBeRtGXziZ1n0XklnFGu7h9gU684zepqyKzgPNzrsrk7xOCxni+TCckjg2Nr/DiaEEGVVmnhYSlT2rB47dQ==";
}; };
} }
{
name = "react___react_16.14.0.tgz";
path = fetchurl {
name = "react___react_16.14.0.tgz";
url = "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz";
sha512 = "0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==";
};
}
{ {
name = "react___react_17.0.2.tgz"; name = "react___react_17.0.2.tgz";
path = fetchurl { path = fetchurl {
@ -9785,14 +9735,6 @@
sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==";
}; };
} }
{
name = "scheduler___scheduler_0.19.1.tgz";
path = fetchurl {
name = "scheduler___scheduler_0.19.1.tgz";
url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz";
sha512 = "n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==";
};
}
{ {
name = "scheduler___scheduler_0.20.2.tgz"; name = "scheduler___scheduler_0.20.2.tgz";
path = fetchurl { path = fetchurl {
@ -10769,14 +10711,6 @@
sha512 = "PIxwAupJZiYU4JmVZYwXp9FKsHMXb5h0ZEFyuXTAn8WLHOlcij+FEcbrvDsom1o5dr1YggEtFbECvGCW2sT53Q=="; sha512 = "PIxwAupJZiYU4JmVZYwXp9FKsHMXb5h0ZEFyuXTAn8WLHOlcij+FEcbrvDsom1o5dr1YggEtFbECvGCW2sT53Q==";
}; };
} }
{
name = "tiny_emitter___tiny_emitter_2.1.0.tgz";
path = fetchurl {
name = "tiny_emitter___tiny_emitter_2.1.0.tgz";
url = "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz";
sha512 = "NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==";
};
}
{ {
name = "tiny_warning___tiny_warning_1.0.3.tgz"; name = "tiny_warning___tiny_warning_1.0.3.tgz";
path = fetchurl { path = fetchurl {
@ -11290,20 +11224,18 @@
}; };
} }
{ {
name = "wcDocker"; name = "wcdocker";
path = path =
let let repo = fetchgit {
repo = fetchgit { url = "https://github.com/pgadmin-org/wcdocker/";
url = "https://github.com/EnterpriseDB/wcDocker/"; rev = "3df8aac825ee2892f4d824de273b779cc6dbcad8";
rev = "3df8aac825ee2892f4d824de273b779cc6dbcad8"; sha256 = "1dihm56s7a34s132a6rh69lri93avz9bwja8bjd9hvpds20phmsg";
sha256 = "1dihm56s7a34s132a6rh69lri93avz9bwja8bjd9hvpds20phmsg"; };
}; in runCommand "wcdocker" { buildInputs = [gnutar]; } ''
in # Set u+w because tar-fs can't unpack archives with read-only dirs
runCommand "wcDocker" { buildInputs = [gnutar]; } '' # https://github.com/mafintosh/tar-fs/issues/79
# Set u+w because tar-fs can't unpack archives with read-only dirs tar cf $out --mode u+w -C ${repo} .
# https://github.com/mafintosh/tar-fs/issues/79 '';
tar cf $out --mode u+w -C ${repo} .
'';
} }
{ {
name = "webfonts_loader___webfonts_loader_7.5.2.tgz"; name = "webfonts_loader___webfonts_loader_7.5.2.tgz";

2
pkgs/top-level/python-packages.nix
View file

@ -10866,7 +10866,7 @@ self: super: with self; {
sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport { }; sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport { };
sphinxcontrib-youtube = callPackage ../development/python-modules/sphinxcontrib-youtube { }; sphinxcontrib-youtube = callPackage ../development/python-modules/sphinxcontrib-youtube { };
sphinx = callPackage ../development/python-modules/sphinx { }; sphinx = callPackage ../development/python-modules/sphinx { };
sphinx-argparse = callPackage ../development/python-modules/sphinx-argparse { }; sphinx-argparse = callPackage ../development/python-modules/sphinx-argparse { };