mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-21 04:28:40 +03:00
commit
5e78a8acb1
@ -107,11 +107,14 @@ import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], ..
|
|||||||
)
|
)
|
||||||
|
|
||||||
# don't bother to test LDAP authentification
|
# don't bother to test LDAP authentification
|
||||||
|
# exclude resql test due to recent postgres 14.4 update
|
||||||
|
# see bugreport here https://redmine.postgresql.org/issues/7527
|
||||||
with subtest("run browser test"):
|
with subtest("run browser test"):
|
||||||
machine.succeed(
|
machine.succeed(
|
||||||
'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
|
'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
|
||||||
&& python regression/runtests.py --pkg browser --exclude \
|
&& python regression/runtests.py \
|
||||||
browser.tests.test_ldap_login.LDAPLoginTestCase,browser.tests.test_ldap_login'
|
--pkg browser \
|
||||||
|
--exclude browser.tests.test_ldap_login.LDAPLoginTestCase,browser.tests.test_ldap_login,resql'
|
||||||
)
|
)
|
||||||
|
|
||||||
# fontconfig is necessary for chromium to run
|
# fontconfig is necessary for chromium to run
|
||||||
@ -123,10 +126,11 @@ import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], ..
|
|||||||
&& python regression/runtests.py --pkg feature_tests'
|
&& python regression/runtests.py --pkg feature_tests'
|
||||||
)
|
)
|
||||||
|
|
||||||
with subtest("run resql test"):
|
# reactivate this test again, when the postgres 14.4 test has been fixed
|
||||||
machine.succeed(
|
# with subtest("run resql test"):
|
||||||
'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
|
# machine.succeed(
|
||||||
&& python regression/runtests.py --pkg resql'
|
# 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \
|
||||||
)
|
# && python regression/runtests.py --pkg resql'
|
||||||
|
# )
|
||||||
'';
|
'';
|
||||||
})
|
})
|
||||||
|
@ -10,11 +10,11 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
pname = "pgadmin";
|
pname = "pgadmin";
|
||||||
version = "6.10";
|
version = "6.11";
|
||||||
|
|
||||||
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-wl7qC0p1NLX4+ulb4AGNPU6D0r838t6t/IYwJZcDnVQ=";
|
sha256 = "sha256-1MvvQvVoWiV5hhgJUcAHbMyZzkADunLtwmszaO4EeCA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
yarnDeps = mkYarnModules {
|
yarnDeps = mkYarnModules {
|
||||||
@ -66,24 +66,14 @@ let
|
|||||||
pyotp
|
pyotp
|
||||||
botocore
|
botocore
|
||||||
boto3
|
boto3
|
||||||
|
azure-mgmt-subscription
|
||||||
|
azure-mgmt-rdbms
|
||||||
|
azure-mgmt-resource
|
||||||
|
azure-identity
|
||||||
];
|
];
|
||||||
|
|
||||||
# override necessary on pgadmin4 6.10
|
# override necessary on pgadmin4 6.11
|
||||||
pythonPackages = python3.pkgs.overrideScope (final: prev: rec {
|
pythonPackages = python3.pkgs.overrideScope (final: prev: rec {
|
||||||
flask = prev.flask.overridePythonAttrs (oldAttrs: rec {
|
|
||||||
version = "2.0.3";
|
|
||||||
src = oldAttrs.src.override {
|
|
||||||
inherit version;
|
|
||||||
sha256 = "sha256-4RIMIoyi9VO0cN9KX6knq2YlhGdSYGmYGz6wqRkCaH0=";
|
|
||||||
};
|
|
||||||
disabledTests = (oldAttrs.disabledTests or [ ]) ++ [
|
|
||||||
"test_aborting"
|
|
||||||
];
|
|
||||||
});
|
|
||||||
flask-paranoid = prev.flask-paranoid.overridePythonAttrs (oldAttrs: rec {
|
|
||||||
# tests fail due to downgrades here
|
|
||||||
doCheck = false;
|
|
||||||
});
|
|
||||||
werkzeug = prev.werkzeug.overridePythonAttrs (oldAttrs: rec {
|
werkzeug = prev.werkzeug.overridePythonAttrs (oldAttrs: rec {
|
||||||
version = "2.0.3";
|
version = "2.0.3";
|
||||||
src = oldAttrs.src.override {
|
src = oldAttrs.src.override {
|
||||||
@ -128,7 +118,9 @@ pythonPackages.buildPythonApplication rec {
|
|||||||
--replace "boto3==1.20.*" "boto3>=1.20" \
|
--replace "boto3==1.20.*" "boto3>=1.20" \
|
||||||
--replace "botocore==1.23.*" "botocore>=1.23" \
|
--replace "botocore==1.23.*" "botocore>=1.23" \
|
||||||
--replace "pytz==2021.*" "pytz" \
|
--replace "pytz==2021.*" "pytz" \
|
||||||
--replace "Werkzeug==2.0.3" "werkzeug>=2.*"
|
--replace "Werkzeug==2.0.3" "werkzeug>=2.*" \
|
||||||
|
--replace "azure-identity==1.9.0" "azure-identity==1.*" \
|
||||||
|
--replace "azure-mgmt-resource==21.0.0" "azure-mgmt-resource==21.*"
|
||||||
# don't use Server Mode (can be overridden later)
|
# don't use Server Mode (can be overridden later)
|
||||||
substituteInPlace pkg/pip/setup_pip.py \
|
substituteInPlace pkg/pip/setup_pip.py \
|
||||||
--replace "req = req.replace('psycopg2', 'psycopg2-binary')" "req = req" \
|
--replace "req = req.replace('psycopg2', 'psycopg2-binary')" "req = req" \
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
"@emotion/react": "^11.1.5",
|
"@emotion/react": "^11.1.5",
|
||||||
"@emotion/styled": "^10.0.14",
|
"@emotion/styled": "^10.0.14",
|
||||||
"@emotion/utils": "^1.0.0",
|
"@emotion/utils": "^1.0.0",
|
||||||
"@svgr/webpack": "^5.5.0",
|
"@svgr/webpack": "^6.2.1",
|
||||||
"@wojtekmaj/enzyme-adapter-react-17": "^0.4.1",
|
"@wojtekmaj/enzyme-adapter-react-17": "^0.4.1",
|
||||||
"autoprefixer": "^10.2.4",
|
"autoprefixer": "^10.2.4",
|
||||||
"axios-mock-adapter": "^1.17.0",
|
"axios-mock-adapter": "^1.17.0",
|
||||||
@ -37,10 +37,6 @@
|
|||||||
"exports-loader": "^2.0.0",
|
"exports-loader": "^2.0.0",
|
||||||
"html-react-parser": "^1.2.7",
|
"html-react-parser": "^1.2.7",
|
||||||
"image-minimizer-webpack-plugin": "^2.2.0",
|
"image-minimizer-webpack-plugin": "^2.2.0",
|
||||||
"imagemin-mozjpeg": "^9.0.0",
|
|
||||||
"imagemin-optipng": "^8.0.0",
|
|
||||||
"imagemin-pngquant": "^9.0.1",
|
|
||||||
"imagemin-svgo": "^8.0.0",
|
|
||||||
"is-docker": "^2.1.1",
|
"is-docker": "^2.1.1",
|
||||||
"istanbul-instrumenter-loader": "^3.0.1",
|
"istanbul-instrumenter-loader": "^3.0.1",
|
||||||
"jasmine-core": "^3.6.0",
|
"jasmine-core": "^3.6.0",
|
||||||
@ -74,7 +70,7 @@
|
|||||||
"webpack": "^5.21.2",
|
"webpack": "^5.21.2",
|
||||||
"webpack-bundle-analyzer": "^4.4.0",
|
"webpack-bundle-analyzer": "^4.4.0",
|
||||||
"webpack-cli": "^4.5.0",
|
"webpack-cli": "^4.5.0",
|
||||||
"yarn-audit-html": "^2.0.0"
|
"yarn-audit-html": "^3.0.1"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/plugin-proposal-class-properties": "^7.10.4",
|
"@babel/plugin-proposal-class-properties": "^7.10.4",
|
||||||
@ -86,8 +82,6 @@
|
|||||||
"@material-ui/icons": "^4.11.2",
|
"@material-ui/icons": "^4.11.2",
|
||||||
"@material-ui/lab": "4.0.0-alpha.58",
|
"@material-ui/lab": "4.0.0-alpha.58",
|
||||||
"@material-ui/pickers": "^3.2.10",
|
"@material-ui/pickers": "^3.2.10",
|
||||||
"@mui/icons-material": "^5.4.2",
|
|
||||||
"@mui/material": "^5.4.3",
|
|
||||||
"@projectstorm/react-diagrams": "^6.6.1",
|
"@projectstorm/react-diagrams": "^6.6.1",
|
||||||
"@simonwep/pickr": "^1.5.1",
|
"@simonwep/pickr": "^1.5.1",
|
||||||
"@szhsin/react-menu": "^2.2.0",
|
"@szhsin/react-menu": "^2.2.0",
|
||||||
@ -111,7 +105,8 @@
|
|||||||
"bootstrap4-toggle": "^3.6.1",
|
"bootstrap4-toggle": "^3.6.1",
|
||||||
"brace": "^0.11.1",
|
"brace": "^0.11.1",
|
||||||
"browserfs": "^1.4.3",
|
"browserfs": "^1.4.3",
|
||||||
"chart.js": "^2.9.3",
|
"chart.js": "^3.0.0",
|
||||||
|
"chartjs-plugin-zoom": "^1.2.1",
|
||||||
"classnames": "^2.2.6",
|
"classnames": "^2.2.6",
|
||||||
"closest": "^0.0.1",
|
"closest": "^0.0.1",
|
||||||
"codemirror": "^5.59.2",
|
"codemirror": "^5.59.2",
|
||||||
@ -141,11 +136,11 @@
|
|||||||
"moment-timezone": "^0.5.34",
|
"moment-timezone": "^0.5.34",
|
||||||
"mousetrap": "^1.6.3",
|
"mousetrap": "^1.6.3",
|
||||||
"notificar": "^1.0.1",
|
"notificar": "^1.0.1",
|
||||||
"notistack": "^2.0.0",
|
"notistack": "^1.0.10",
|
||||||
"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/#b0287d39b54de28cb2a83f0c19a95ce823f6feae",
|
"pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#07cc449e1d89ecc8cce3679d8cff5a35f1db67ee",
|
||||||
"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",
|
||||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user