From fa01814245e0f6a4dedb720027db87923a404ad3 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Tue, 19 Apr 2022 20:21:41 +0200 Subject: [PATCH 1/8] pgadmin4: 6.7 -> 6.8 Signed-off-by: Florian Brandes --- pkgs/tools/admin/pgadmin/default.nix | 8 +- pkgs/tools/admin/pgadmin/package.json | 11 +- pkgs/tools/admin/pgadmin/yarn.lock | 253 +++++++++++++++++++++++--- pkgs/tools/admin/pgadmin/yarn.nix | 244 +++++++++++++++++++++++-- 4 files changed, 468 insertions(+), 48 deletions(-) diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 84781688ec1a..50988681884e 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -11,11 +11,11 @@ let pname = "pgadmin"; - version = "6.7"; + version = "6.8"; src = fetchurl { url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz"; - sha256 = "1g2yxwgj9fp1fkn8j2jrdhmr2b2s6y8sgv4jq55aaxm4hfkkqh6d"; + sha256 = "sha256-kS9GV/j28zkXTJZkRrG2JDgas210rQqXOJrwwxzepbw="; }; yarnDeps = mkYarnModules { @@ -49,13 +49,13 @@ python3.pkgs.buildPythonApplication rec { patchShebangs . # relax dependencies substituteInPlace requirements.txt \ - --replace "Pillow==8.3.*" "Pillow>=8.3.0" \ --replace "psycopg2==2.9.*" "psycopg2>=2.9" \ --replace "cryptography==3.*" "cryptography>=3.0" \ --replace "requests==2.25.*" "requests>=2.25.0" \ --replace "boto3==1.20.*" "boto3>=1.20" \ --replace "botocore==1.23.*" "botocore>=1.23" \ - --replace "pytz==2021.*" "pytz" + --replace "pytz==2021.*" "pytz" \ + --replace "Werkzeug==2.0.3" "werkzeug>=2.*" # don't use Server Mode (can be overridden later) substituteInPlace pkg/pip/setup_pip.py \ --replace "req = req.replace('psycopg2', 'psycopg2-binary')" "req = req" \ diff --git a/pkgs/tools/admin/pgadmin/package.json b/pkgs/tools/admin/pgadmin/package.json index e4a27bd10d7b..d708b05e4883 100644 --- a/pkgs/tools/admin/pgadmin/package.json +++ b/pkgs/tools/admin/pgadmin/package.json @@ -8,8 +8,8 @@ "license": "PostgreSQL", "devDependencies": { "@babel/core": "^7.10.2", - "@babel/eslint-parser": "^7.12.13", - "@babel/eslint-plugin": "^7.12.13", + "@babel/eslint-parser": "^7.17.0", + "@babel/eslint-plugin": "^7.17.7", "@babel/plugin-proposal-object-rest-spread": "^7.10.1", "@babel/plugin-syntax-jsx": "^7.16.0", "@babel/preset-env": "^7.10.2", @@ -82,11 +82,12 @@ "@date-io/core": "^1.3.6", "@date-io/date-fns": "1.x", "@emotion/sheet": "^1.0.1", - "@fortawesome/fontawesome-free": "^5.14.0", "@material-ui/core": "4.11.0", "@material-ui/icons": "^4.11.2", "@material-ui/lab": "4.0.0-alpha.58", "@material-ui/pickers": "^3.2.10", + "@mui/icons-material": "^5.4.2", + "@mui/material": "^5.4.3", "@projectstorm/react-diagrams": "^6.6.1", "@simonwep/pickr": "^1.5.1", "@szhsin/react-menu": "^2.2.0", @@ -145,7 +146,7 @@ "path-fx": "^2.0.0", "pathfinding": "^0.4.18", "paths-js": "^0.4.9", - "pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#bf7ac7be65898883e3e05c9733426152a1da6422", + "pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#c966febebcdffaa46f1ccf0769fe5308f179d613", "postcss": "^8.2.15", "raf": "^3.4.1", "rc-dock": "^3.2.9", @@ -154,6 +155,8 @@ "react-checkbox-tree": "^1.7.2", "react-dom": "^17.0.1", "react-draggable": "^4.4.4", + "react-rnd": "^10.3.5", + "react-router-dom": "^6.2.2", "react-select": "^4.2.1", "react-table": "^7.6.3", "react-timer-hook": "^3.0.5", diff --git a/pkgs/tools/admin/pgadmin/yarn.lock b/pkgs/tools/admin/pgadmin/yarn.lock index 7dc709ab5add..bfb47913f8fb 100644 --- a/pkgs/tools/admin/pgadmin/yarn.lock +++ b/pkgs/tools/admin/pgadmin/yarn.lock @@ -91,19 +91,19 @@ json5 "^2.1.2" semver "^6.3.0" -"@babel/eslint-parser@^7.12.13": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.13.8.tgz#6f2bde6b0690fcc0598b4869fc7c8e8b55b17687" - integrity sha512-XewKkiyukrGzMeqToXJQk6hjg2veI9SNQElGzAoAjKxYCLbgcVX4KA2WhoyqMon9N4RMdCZhNTJNOBcp9spsiw== +"@babel/eslint-parser@^7.17.0": + version "7.17.0" + resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz#eabb24ad9f0afa80e5849f8240d0e5facc2d90d6" + integrity sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA== dependencies: - eslint-scope "5.1.0" - eslint-visitor-keys "^1.3.0" + eslint-scope "^5.1.1" + eslint-visitor-keys "^2.1.0" semver "^6.3.0" -"@babel/eslint-plugin@^7.12.13": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.13.0.tgz#e6d99efcd6b8551adf479e382a47218726179b1b" - integrity sha512-YGwCLc/u/uc3bU+q/fvgRQ62+TkxuyVvdmybK6ElzE49vODp+RnRe16eJzMM7EwvcRPQfQvcOSuGmzfcbZE2+w== +"@babel/eslint-plugin@^7.17.7": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.17.7.tgz#4ee1d5b29b79130f3bb5a933358376bcbee172b8" + integrity sha512-JATUoJJXSgwI0T8juxWYtK1JSgoLpIGUsCHIv+NMXcUDA2vIe6nvAHR9vnuJgs/P1hOFw7vPwibixzfqBBLIVw== dependencies: eslint-rule-composer "^0.3.0" @@ -1741,6 +1741,13 @@ dependencies: regenerator-runtime "^0.13.4" +"@babel/runtime@^7.17.2", "@babel/runtime@^7.7.6": + version "7.17.8" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.8.tgz#3e56e4aff81befa55ac3ac6a0967349fd1c5bca2" + integrity sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA== + dependencies: + regenerator-runtime "^0.13.4" + "@babel/template@^7.12.13", "@babel/template@^7.14.5": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4" @@ -1849,6 +1856,17 @@ "@emotion/weak-memoize" "^0.2.5" stylis "^4.0.3" +"@emotion/cache@^11.7.1": + version "11.7.1" + resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.7.1.tgz#08d080e396a42e0037848214e8aa7bf879065539" + integrity sha512-r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A== + dependencies: + "@emotion/memoize" "^0.7.4" + "@emotion/sheet" "^1.1.0" + "@emotion/utils" "^1.0.0" + "@emotion/weak-memoize" "^0.2.5" + stylis "4.0.13" + "@emotion/core@^10.0.14": version "10.1.1" resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.1.1.tgz#c956c1365f2f2481960064bcb8c4732e5fb612c3" @@ -1882,6 +1900,13 @@ dependencies: "@emotion/memoize" "0.7.4" +"@emotion/is-prop-valid@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.2.tgz#34ad6e98e871aa6f7a20469b602911b8b11b3a95" + integrity sha512-3QnhqeL+WW88YjYbQL5gUIkthuMw7a0NGbZ7wfFVk2kg/CK5w8w5FFa0RzWjyY1+sujN0NWbtSHH6OJmWHtJpQ== + dependencies: + "@emotion/memoize" "^0.7.4" + "@emotion/memoize@0.7.4": version "0.7.4" resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb" @@ -1937,6 +1962,11 @@ resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.0.1.tgz#245f54abb02dfd82326e28689f34c27aa9b2a698" integrity sha512-GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g== +"@emotion/sheet@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.0.tgz#56d99c41f0a1cda2726a05aa6a20afd4c63e58d2" + integrity sha512-u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g== + "@emotion/styled-base@^10.0.27": version "10.0.31" resolved "https://registry.yarnpkg.com/@emotion/styled-base/-/styled-base-10.0.31.tgz#940957ee0aa15c6974adc7d494ff19765a2f742a" @@ -2117,6 +2147,93 @@ prop-types "^15.7.2" react-is "^16.8.0 || ^17.0.0" +"@mui/base@5.0.0-alpha.74": + version "5.0.0-alpha.74" + resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.74.tgz#15509242e7911446d5957375b1b18cbb72b3a750" + integrity sha512-pw3T1xNXpW8pLo9+BvtyazZb0CSjNJsjbzznlbV/aNkBfjNPXQVI3X1NDm3WSI8y6M96WDIVO7XrHAohOwALSQ== + dependencies: + "@babel/runtime" "^7.17.2" + "@emotion/is-prop-valid" "^1.1.2" + "@mui/types" "^7.1.3" + "@mui/utils" "^5.5.3" + "@popperjs/core" "^2.11.4" + clsx "^1.1.1" + prop-types "^15.7.2" + react-is "^17.0.2" + +"@mui/icons-material@^5.4.2": + version "5.5.1" + resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.5.1.tgz#848a57972617411370775980cbc6990588d4aafb" + integrity sha512-40f68p5+Yhq3dCn3QYHqQt5RETPyR3AkDw+fma8PtcjqvZ+d+jF84kFmT6NqwA3he7TlwluEtkyAmPzUE4uPdA== + dependencies: + "@babel/runtime" "^7.17.2" + +"@mui/material@^5.4.3": + version "5.5.3" + resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.5.3.tgz#411e53a69da3f9d6664e99f1bdcdaf2760540fdc" + integrity sha512-eADa3kUYbbr1jNjcufn0a7HeU8cSo0agbrkj720hodxVFNIfzq7a2e58Z+PaZqll55kMGBvlYJ7rTcXU399x5A== + dependencies: + "@babel/runtime" "^7.17.2" + "@mui/base" "5.0.0-alpha.74" + "@mui/system" "^5.5.3" + "@mui/types" "^7.1.3" + "@mui/utils" "^5.5.3" + "@types/react-transition-group" "^4.4.4" + clsx "^1.1.1" + csstype "^3.0.11" + hoist-non-react-statics "^3.3.2" + prop-types "^15.7.2" + react-is "^17.0.2" + react-transition-group "^4.4.2" + +"@mui/private-theming@^5.5.3": + version "5.5.3" + resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.5.3.tgz#c232a39dd3c268fdef7e92ccc40d51bda9eec3ab" + integrity sha512-Wf7NurY7lk8SBWelSBY2U02zxLt1773JpIcXTHuEC9/GZdQA4CXCJGl2cVQzheKhee5rZ+8JwGulrRiVl1m+4A== + dependencies: + "@babel/runtime" "^7.17.2" + "@mui/utils" "^5.5.3" + prop-types "^15.7.2" + +"@mui/styled-engine@^5.5.2": + version "5.5.2" + resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.5.2.tgz#1f92dd27d76f0b7df7aa52c7c7a710e59b2275a6" + integrity sha512-jkz5AHHbA43akBo5L3y1X1/X0f+RvXvCp3eXKt+iOf3qnKSAausbtlVz7gBbC4xIWDnP1Jb/6T+t/0/7gObRYA== + dependencies: + "@babel/runtime" "^7.17.2" + "@emotion/cache" "^11.7.1" + prop-types "^15.7.2" + +"@mui/system@^5.5.3": + version "5.5.3" + resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.5.3.tgz#c78d4c16009430389ffd3495d694945422d72ca5" + integrity sha512-J9JcySJuEqfEoP334K/2gEWm2vOx73Uqjii3qlFVhWRBOAJ0Pjyk0sN5W/eVRbwhUm95DNgh2V5s8dRK3vzyVw== + dependencies: + "@babel/runtime" "^7.17.2" + "@mui/private-theming" "^5.5.3" + "@mui/styled-engine" "^5.5.2" + "@mui/types" "^7.1.3" + "@mui/utils" "^5.5.3" + clsx "^1.1.1" + csstype "^3.0.11" + prop-types "^15.7.2" + +"@mui/types@^7.1.3": + version "7.1.3" + resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.1.3.tgz#d7636f3046110bcccc63e6acfd100e2ad9ca712a" + integrity sha512-DDF0UhMBo4Uezlk+6QxrlDbchF79XG6Zs0zIewlR4c0Dt6GKVFfUtzPtHCH1tTbcSlq/L2bGEdiaoHBJ9Y1gSA== + +"@mui/utils@^5.5.3": + version "5.5.3" + resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.5.3.tgz#f6e1f10c0e8f4d0bf750588c2c3a96ad819c5b65" + integrity sha512-t627eVRpl3SlxVya0cIVNs8jPl4KCEiGaTSWY9iKKTcMNaeDbuRML+zv/CFHDPr1zFv+FjJSP02ySB+tZ8xIag== + dependencies: + "@babel/runtime" "^7.17.2" + "@types/prop-types" "^15.7.4" + "@types/react-is" "^16.7.1 || ^17.0.0" + prop-types "^15.7.2" + react-is "^17.0.2" + "@nodelib/fs.scandir@2.1.4": version "2.1.4" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69" @@ -2159,6 +2276,11 @@ resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.15.tgz#6a9d143f7f4f49db2d782f9e1c8839a29b43ae23" integrity sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA== +"@popperjs/core@^2.11.4": + version "2.11.4" + resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.4.tgz#d8c7b8db9226d2d7664553a0741ad7d0397ee503" + integrity sha512-q/ytXxO5NKvyT37pmisQAItCFqA7FD/vNb8dgaJy3/630Fsc+Mz9/9f2SziBoIZ30TJooXyTwZmhi1zjXmObYg== + "@popperjs/core@^2.8.3": version "2.9.0" resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.0.tgz#32e63212293dd3efbb521cd35a5020ab66eaa546" @@ -2436,6 +2558,11 @@ resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7" integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw== +"@types/prop-types@^15.7.4": + version "15.7.4" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" + integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ== + "@types/q@^1.5.1": version "1.5.4" resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24" @@ -2448,6 +2575,13 @@ dependencies: "@types/react" "^16" +"@types/react-is@^16.7.1 || ^17.0.0": + version "17.0.3" + resolved "https://registry.yarnpkg.com/@types/react-is/-/react-is-17.0.3.tgz#2d855ba575f2fc8d17ef9861f084acc4b90a137a" + integrity sha512-aBTIWg1emtu95bLTLx0cpkxwGW3ueZv71nE2YFBpL8k/z5czEW8yYpOo8Dp+UUAFAtKwNaOsh/ioSeQnWlZcfw== + dependencies: + "@types/react" "*" + "@types/react-transition-group@^4.2.0": version "4.4.1" resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.1.tgz#e1a3cb278df7f47f17b5082b1b3da17170bd44b1" @@ -2455,6 +2589,13 @@ dependencies: "@types/react" "*" +"@types/react-transition-group@^4.4.4": + version "4.4.4" + resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.4.tgz#acd4cceaa2be6b757db61ed7b432e103242d163e" + integrity sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug== + dependencies: + "@types/react" "*" + "@types/react@*", "@types/react@^16": version "16.14.10" resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.10.tgz#76bc1c42ed5ab0d2ab13e5c58faaccaad3449477" @@ -4540,6 +4681,11 @@ csstype@^2.5.2, csstype@^2.5.7: resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.16.tgz#544d69f547013b85a40d15bff75db38f34fe9c39" integrity sha512-61FBWoDHp/gRtsoDkq/B1nWrCUG/ok1E3tUrcNbZjsE9Cxd9yzUirjS3+nAATB8U4cTtaQmAHbNndoFz5L6C9Q== +csstype@^3.0.11: + version "3.0.11" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz#d66700c5eacfac1940deb4e3ee5642792d85cd33" + integrity sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw== + csstype@^3.0.2: version "3.0.8" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz#d2266a792729fb227cd216fb572f43728e1ad340" @@ -5223,14 +5369,6 @@ eslint-rule-composer@^0.3.0: resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9" integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg== -eslint-scope@5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5" - integrity sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w== - dependencies: - esrecurse "^4.1.0" - estraverse "^4.1.1" - eslint-scope@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" @@ -5251,7 +5389,7 @@ eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== -eslint-visitor-keys@^2.0.0: +eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== @@ -5320,7 +5458,7 @@ esquery@^1.4.0: dependencies: estraverse "^5.1.0" -esrecurse@^4.1.0, esrecurse@^4.3.0: +esrecurse@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== @@ -5498,6 +5636,11 @@ fast-levenshtein@^2.0.6: resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= +fast-memoize@^2.5.1: + version "2.5.2" + resolved "https://registry.yarnpkg.com/fast-memoize/-/fast-memoize-2.5.2.tgz#79e3bb6a4ec867ea40ba0e7146816f6cdce9b57e" + integrity sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw== + fast-safe-stringify@^2.0.7: version "2.0.7" resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743" @@ -6059,6 +6202,13 @@ hex-color-regex@^1.1.0: resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== +history@^5.2.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz#1548abaa245ba47992f063a0783db91ef201c73b" + integrity sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ== + dependencies: + "@babel/runtime" "^7.7.6" + hmac-drbg@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" @@ -8351,9 +8501,9 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= -"pgadmin4-tree@git+https://github.com/EnterpriseDB/pgadmin4-treeview/#bf7ac7be65898883e3e05c9733426152a1da6422": +"pgadmin4-tree@git+https://github.com/EnterpriseDB/pgadmin4-treeview/#c966febebcdffaa46f1ccf0769fe5308f179d613": version "1.0.0" - resolved "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#bf7ac7be65898883e3e05c9733426152a1da6422" + resolved "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#c966febebcdffaa46f1ccf0769fe5308f179d613" dependencies: "@types/classnames" "^2.2.6" "@types/react" "^16.7.18" @@ -9023,6 +9173,13 @@ rc-util@^5.12.0, rc-util@^5.15.0, rc-util@^5.2.1, rc-util@^5.3.0, rc-util@^5.5.0 react-is "^16.12.0" shallowequal "^1.1.0" +re-resizable@6.9.1: + version "6.9.1" + resolved "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.9.1.tgz#6be082b55d02364ca4bfee139e04feebdf52441c" + integrity sha512-KRYAgr9/j1PJ3K+t+MBhlQ+qkkoLDJ1rs0z1heIWvYbCW/9Vq4djDU+QumJ3hQbwwtzXF6OInla6rOx6hhgRhQ== + dependencies: + fast-memoize "^2.5.1" + react-aspen@^1.1.0, react-aspen@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/react-aspen/-/react-aspen-1.1.1.tgz#61a85ef43748158322c4a3b73faaa5e563edd038" @@ -9063,6 +9220,14 @@ react-dom@^17.0.1: object-assign "^4.1.1" scheduler "^0.20.2" +react-draggable@4.4.3: + version "4.4.3" + resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.3.tgz#0727f2cae5813e36b0e4962bf11b2f9ef2b406f3" + integrity sha512-jV4TE59MBuWm7gb6Ns3Q1mxX8Azffb7oTtDtBgFkxRvhDp38YAARmRplrj0+XGkhOJB5XziArX+4HUUABtyZ0w== + dependencies: + classnames "^2.2.5" + prop-types "^15.6.0" + react-draggable@^4.4.4: version "4.4.4" resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.4.tgz#5b26d9996be63d32d285a426f41055de87e59b2f" @@ -9093,6 +9258,30 @@ react-property@1.0.1: resolved "https://registry.yarnpkg.com/react-property/-/react-property-1.0.1.tgz#4ae4211557d0a0ae050a71aa8ad288c074bea4e6" integrity sha512-1tKOwxFn3dXVomH6pM9IkLkq2Y8oh+fh/lYW3MJ/B03URswUTqttgckOlbxY2XHF3vPG6uanSc4dVsLW/wk3wQ== +react-rnd@^10.3.5: + version "10.3.5" + resolved "https://registry.yarnpkg.com/react-rnd/-/react-rnd-10.3.5.tgz#b66e5e06f1eb6823e72eb4b552081b4b9241b139" + integrity sha512-LWJP+l5bp76sDPKrKM8pwGJifI6i3B5jHK4ONACczVMbR8ycNGA75ORRqpRuXGyKawUs68s1od05q8cqWgQXgw== + dependencies: + re-resizable "6.9.1" + react-draggable "4.4.3" + tslib "2.3.0" + +react-router-dom@^6.2.2: + version "6.3.0" + resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.3.0.tgz#a0216da813454e521905b5fa55e0e5176123f43d" + integrity sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw== + dependencies: + history "^5.2.0" + react-router "6.3.0" + +react-router@6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz#3970cc64b4cb4eae0c1ea5203a80334fdd175557" + integrity sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ== + dependencies: + history "^5.2.0" + react-select@^4.2.1: version "4.3.1" resolved "https://registry.yarnpkg.com/react-select/-/react-select-4.3.1.tgz#389fc07c9bc7cf7d3c377b7a05ea18cd7399cb81" @@ -9144,6 +9333,16 @@ react-transition-group@^4.0.0, react-transition-group@^4.3.0, react-transition-g loose-envify "^1.4.0" prop-types "^15.6.2" +react-transition-group@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470" + integrity sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg== + dependencies: + "@babel/runtime" "^7.5.5" + dom-helpers "^5.0.1" + loose-envify "^1.4.0" + prop-types "^15.6.2" + react-transition-state@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/react-transition-state/-/react-transition-state-1.1.3.tgz#6d999dc640ffd3a7442021a14a58e13347f4e95f" @@ -10161,6 +10360,11 @@ stylehacks@^5.0.1: browserslist "^4.16.0" postcss-selector-parser "^6.0.4" +stylis@4.0.13: + version "4.0.13" + resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz#f5db332e376d13cc84ecfe5dace9a2a51d954c91" + integrity sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag== + stylis@^4.0.3, stylis@^4.0.7: version "4.0.10" resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.10.tgz#446512d1097197ab3f02fb3c258358c3f7a14240" @@ -10511,6 +10715,11 @@ trim-right@^1.0.1: resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM= +tslib@2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e" + integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== + tslib@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c" diff --git a/pkgs/tools/admin/pgadmin/yarn.nix b/pkgs/tools/admin/pgadmin/yarn.nix index eca056bc9218..9e2ed892fcd2 100644 --- a/pkgs/tools/admin/pgadmin/yarn.nix +++ b/pkgs/tools/admin/pgadmin/yarn.nix @@ -74,19 +74,19 @@ }; } { - name = "_babel_eslint_parser___eslint_parser_7.13.8.tgz"; + name = "_babel_eslint_parser___eslint_parser_7.17.0.tgz"; path = fetchurl { - name = "_babel_eslint_parser___eslint_parser_7.13.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.13.8.tgz"; - sha512 = "XewKkiyukrGzMeqToXJQk6hjg2veI9SNQElGzAoAjKxYCLbgcVX4KA2WhoyqMon9N4RMdCZhNTJNOBcp9spsiw=="; + name = "_babel_eslint_parser___eslint_parser_7.17.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz"; + sha512 = "PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA=="; }; } { - name = "_babel_eslint_plugin___eslint_plugin_7.13.0.tgz"; + name = "_babel_eslint_plugin___eslint_plugin_7.17.7.tgz"; path = fetchurl { - name = "_babel_eslint_plugin___eslint_plugin_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.13.0.tgz"; - sha512 = "YGwCLc/u/uc3bU+q/fvgRQ62+TkxuyVvdmybK6ElzE49vODp+RnRe16eJzMM7EwvcRPQfQvcOSuGmzfcbZE2+w=="; + name = "_babel_eslint_plugin___eslint_plugin_7.17.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.17.7.tgz"; + sha512 = "JATUoJJXSgwI0T8juxWYtK1JSgoLpIGUsCHIv+NMXcUDA2vIe6nvAHR9vnuJgs/P1hOFw7vPwibixzfqBBLIVw=="; }; } { @@ -1577,6 +1577,14 @@ sha512 = "etcO/ohMNaNA2UBdaXBBSX/3aEzFMRrVfaPv8Ptc0k+cWpWW0QFiGZ2XnVqQZI1Cf734LbPGmqBKWESfW4x/dQ=="; }; } + { + name = "_babel_runtime___runtime_7.17.8.tgz"; + path = fetchurl { + name = "_babel_runtime___runtime_7.17.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.8.tgz"; + sha512 = "dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA=="; + }; + } { name = "_babel_template___template_7.14.5.tgz"; path = fetchurl { @@ -1673,6 +1681,14 @@ sha512 = "Zx70bjE7LErRO9OaZrhf22Qye1y4F7iDl+ITjet0J+i+B88PrAOBkKvaAWhxsZf72tDLajwCgfCjJ2dvH77C3g=="; }; } + { + name = "_emotion_cache___cache_11.7.1.tgz"; + path = fetchurl { + name = "_emotion_cache___cache_11.7.1.tgz"; + url = "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.7.1.tgz"; + sha512 = "r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A=="; + }; + } { name = "_emotion_core___core_10.1.1.tgz"; path = fetchurl { @@ -1705,6 +1721,14 @@ sha512 = "u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA=="; }; } + { + name = "_emotion_is_prop_valid___is_prop_valid_1.1.2.tgz"; + path = fetchurl { + name = "_emotion_is_prop_valid___is_prop_valid_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.2.tgz"; + sha512 = "3QnhqeL+WW88YjYbQL5gUIkthuMw7a0NGbZ7wfFVk2kg/CK5w8w5FFa0RzWjyY1+sujN0NWbtSHH6OJmWHtJpQ=="; + }; + } { name = "_emotion_memoize___memoize_0.7.4.tgz"; path = fetchurl { @@ -1761,6 +1785,14 @@ sha512 = "GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g=="; }; } + { + name = "_emotion_sheet___sheet_1.1.0.tgz"; + path = fetchurl { + name = "_emotion_sheet___sheet_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.0.tgz"; + sha512 = "u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g=="; + }; + } { name = "_emotion_styled_base___styled_base_10.0.31.tgz"; path = fetchurl { @@ -1929,6 +1961,70 @@ sha512 = "Uul8w38u+PICe2Fg2pDKCaIG7kOyhowZ9vjiC1FsVwPABTW8vPPKfF6OvxRq3IiBaI1faOJmgdvMG7rMJARBhA=="; }; } + { + name = "_mui_base___base_5.0.0_alpha.74.tgz"; + path = fetchurl { + name = "_mui_base___base_5.0.0_alpha.74.tgz"; + url = "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.74.tgz"; + sha512 = "pw3T1xNXpW8pLo9+BvtyazZb0CSjNJsjbzznlbV/aNkBfjNPXQVI3X1NDm3WSI8y6M96WDIVO7XrHAohOwALSQ=="; + }; + } + { + name = "_mui_icons_material___icons_material_5.5.1.tgz"; + path = fetchurl { + name = "_mui_icons_material___icons_material_5.5.1.tgz"; + url = "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.5.1.tgz"; + sha512 = "40f68p5+Yhq3dCn3QYHqQt5RETPyR3AkDw+fma8PtcjqvZ+d+jF84kFmT6NqwA3he7TlwluEtkyAmPzUE4uPdA=="; + }; + } + { + name = "_mui_material___material_5.5.3.tgz"; + path = fetchurl { + name = "_mui_material___material_5.5.3.tgz"; + url = "https://registry.yarnpkg.com/@mui/material/-/material-5.5.3.tgz"; + sha512 = "eADa3kUYbbr1jNjcufn0a7HeU8cSo0agbrkj720hodxVFNIfzq7a2e58Z+PaZqll55kMGBvlYJ7rTcXU399x5A=="; + }; + } + { + name = "_mui_private_theming___private_theming_5.5.3.tgz"; + path = fetchurl { + name = "_mui_private_theming___private_theming_5.5.3.tgz"; + url = "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.5.3.tgz"; + sha512 = "Wf7NurY7lk8SBWelSBY2U02zxLt1773JpIcXTHuEC9/GZdQA4CXCJGl2cVQzheKhee5rZ+8JwGulrRiVl1m+4A=="; + }; + } + { + name = "_mui_styled_engine___styled_engine_5.5.2.tgz"; + path = fetchurl { + name = "_mui_styled_engine___styled_engine_5.5.2.tgz"; + url = "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.5.2.tgz"; + sha512 = "jkz5AHHbA43akBo5L3y1X1/X0f+RvXvCp3eXKt+iOf3qnKSAausbtlVz7gBbC4xIWDnP1Jb/6T+t/0/7gObRYA=="; + }; + } + { + name = "_mui_system___system_5.5.3.tgz"; + path = fetchurl { + name = "_mui_system___system_5.5.3.tgz"; + url = "https://registry.yarnpkg.com/@mui/system/-/system-5.5.3.tgz"; + sha512 = "J9JcySJuEqfEoP334K/2gEWm2vOx73Uqjii3qlFVhWRBOAJ0Pjyk0sN5W/eVRbwhUm95DNgh2V5s8dRK3vzyVw=="; + }; + } + { + name = "_mui_types___types_7.1.3.tgz"; + path = fetchurl { + name = "_mui_types___types_7.1.3.tgz"; + url = "https://registry.yarnpkg.com/@mui/types/-/types-7.1.3.tgz"; + sha512 = "DDF0UhMBo4Uezlk+6QxrlDbchF79XG6Zs0zIewlR4c0Dt6GKVFfUtzPtHCH1tTbcSlq/L2bGEdiaoHBJ9Y1gSA=="; + }; + } + { + name = "_mui_utils___utils_5.5.3.tgz"; + path = fetchurl { + name = "_mui_utils___utils_5.5.3.tgz"; + url = "https://registry.yarnpkg.com/@mui/utils/-/utils-5.5.3.tgz"; + sha512 = "t627eVRpl3SlxVya0cIVNs8jPl4KCEiGaTSWY9iKKTcMNaeDbuRML+zv/CFHDPr1zFv+FjJSP02ySB+tZ8xIag=="; + }; + } { name = "_nodelib_fs.scandir___fs.scandir_2.1.4.tgz"; path = fetchurl { @@ -1977,6 +2073,14 @@ sha512 = "15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA=="; }; } + { + name = "_popperjs_core___core_2.11.4.tgz"; + path = fetchurl { + name = "_popperjs_core___core_2.11.4.tgz"; + url = "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.4.tgz"; + sha512 = "q/ytXxO5NKvyT37pmisQAItCFqA7FD/vNb8dgaJy3/630Fsc+Mz9/9f2SziBoIZ30TJooXyTwZmhi1zjXmObYg=="; + }; + } { name = "_popperjs_core___core_2.9.0.tgz"; path = fetchurl { @@ -2313,6 +2417,14 @@ sha512 = "KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw=="; }; } + { + name = "_types_prop_types___prop_types_15.7.4.tgz"; + path = fetchurl { + name = "_types_prop_types___prop_types_15.7.4.tgz"; + url = "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz"; + sha512 = "rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ=="; + }; + } { name = "_types_q___q_1.5.4.tgz"; path = fetchurl { @@ -2329,6 +2441,14 @@ sha512 = "FIX2AVmPTGP30OUJ+0vadeIFJJ07Mh1m+U0rxfgyW34p3rTlXI+nlenvAxNn4BP36YyI9IJ/+UJ7Wu22N1pI7A=="; }; } + { + name = "_types_react_is___react_is_17.0.3.tgz"; + path = fetchurl { + name = "_types_react_is___react_is_17.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/react-is/-/react-is-17.0.3.tgz"; + sha512 = "aBTIWg1emtu95bLTLx0cpkxwGW3ueZv71nE2YFBpL8k/z5czEW8yYpOo8Dp+UUAFAtKwNaOsh/ioSeQnWlZcfw=="; + }; + } { name = "_types_react_transition_group___react_transition_group_4.4.1.tgz"; path = fetchurl { @@ -2337,6 +2457,14 @@ sha512 = "vIo69qKKcYoJ8wKCJjwSgCTM+z3chw3g18dkrDfVX665tMH7tmbDxEAnPdey4gTlwZz5QuHGzd+hul0OVZDqqQ=="; }; } + { + name = "_types_react_transition_group___react_transition_group_4.4.4.tgz"; + path = fetchurl { + name = "_types_react_transition_group___react_transition_group_4.4.4.tgz"; + url = "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.4.tgz"; + sha512 = "7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug=="; + }; + } { name = "_types_react___react_16.14.10.tgz"; path = fetchurl { @@ -4473,6 +4601,14 @@ sha512 = "61FBWoDHp/gRtsoDkq/B1nWrCUG/ok1E3tUrcNbZjsE9Cxd9yzUirjS3+nAATB8U4cTtaQmAHbNndoFz5L6C9Q=="; }; } + { + name = "csstype___csstype_3.0.11.tgz"; + path = fetchurl { + name = "csstype___csstype_3.0.11.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz"; + sha512 = "sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw=="; + }; + } { name = "csstype___csstype_3.0.8.tgz"; path = fetchurl { @@ -5185,14 +5321,6 @@ sha512 = "bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg=="; }; } - { - name = "eslint_scope___eslint_scope_5.1.0.tgz"; - path = fetchurl { - name = "eslint_scope___eslint_scope_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz"; - sha512 = "iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w=="; - }; - } { name = "eslint_scope___eslint_scope_5.1.1.tgz"; path = fetchurl { @@ -5441,6 +5569,14 @@ sha1 = "PYpcZog6FqMMqGQ+hR8Zuqd5eRc="; }; } + { + name = "fast_memoize___fast_memoize_2.5.2.tgz"; + path = fetchurl { + name = "fast_memoize___fast_memoize_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/fast-memoize/-/fast-memoize-2.5.2.tgz"; + sha512 = "Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw=="; + }; + } { name = "fast_safe_stringify___fast_safe_stringify_2.0.7.tgz"; path = fetchurl { @@ -6081,6 +6217,14 @@ sha512 = "l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="; }; } + { + name = "history___history_5.3.0.tgz"; + path = fetchurl { + name = "history___history_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz"; + sha512 = "ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ=="; + }; + } { name = "hmac_drbg___hmac_drbg_1.0.1.tgz"; path = fetchurl { @@ -8823,8 +8967,8 @@ let repo = fetchgit { url = "https://github.com/EnterpriseDB/pgadmin4-treeview/"; - rev = "bf7ac7be65898883e3e05c9733426152a1da6422"; - sha256 = "0nsn7s0d1kpgpb554hkz7nsifzdyff06qc78gqmzd8j3sfcbjk63"; + rev = "c966febebcdffaa46f1ccf0769fe5308f179d613"; + sha256 = "0fxjalh7g8fwy3fczbj9pvf8g06chq41gw1jidz106wadjr72081"; }; in runCommand "pgadmin4-treeview" { buildInputs = [gnutar]; } '' @@ -9553,6 +9697,14 @@ sha512 = "HWuTIKzBeZQQ7IBqdokE0wMp/xx39/KfUJ0gcquBigoldDCrf3YBcWFHrrQlJG7sI82Wg8mwp1uAKV3zMGfAgg=="; }; } + { + name = "re_resizable___re_resizable_6.9.1.tgz"; + path = fetchurl { + name = "re_resizable___re_resizable_6.9.1.tgz"; + url = "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.9.1.tgz"; + sha512 = "KRYAgr9/j1PJ3K+t+MBhlQ+qkkoLDJ1rs0z1heIWvYbCW/9Vq4djDU+QumJ3hQbwwtzXF6OInla6rOx6hhgRhQ=="; + }; + } { name = "react_aspen___react_aspen_1.1.1.tgz"; path = fetchurl { @@ -9585,6 +9737,14 @@ sha512 = "s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA=="; }; } + { + name = "react_draggable___react_draggable_4.4.3.tgz"; + path = fetchurl { + name = "react_draggable___react_draggable_4.4.3.tgz"; + url = "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.3.tgz"; + sha512 = "jV4TE59MBuWm7gb6Ns3Q1mxX8Azffb7oTtDtBgFkxRvhDp38YAARmRplrj0+XGkhOJB5XziArX+4HUUABtyZ0w=="; + }; + } { name = "react_draggable___react_draggable_4.4.4.tgz"; path = fetchurl { @@ -9625,6 +9785,30 @@ sha512 = "1tKOwxFn3dXVomH6pM9IkLkq2Y8oh+fh/lYW3MJ/B03URswUTqttgckOlbxY2XHF3vPG6uanSc4dVsLW/wk3wQ=="; }; } + { + name = "react_rnd___react_rnd_10.3.5.tgz"; + path = fetchurl { + name = "react_rnd___react_rnd_10.3.5.tgz"; + url = "https://registry.yarnpkg.com/react-rnd/-/react-rnd-10.3.5.tgz"; + sha512 = "LWJP+l5bp76sDPKrKM8pwGJifI6i3B5jHK4ONACczVMbR8ycNGA75ORRqpRuXGyKawUs68s1od05q8cqWgQXgw=="; + }; + } + { + name = "react_router_dom___react_router_dom_6.3.0.tgz"; + path = fetchurl { + name = "react_router_dom___react_router_dom_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.3.0.tgz"; + sha512 = "uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw=="; + }; + } + { + name = "react_router___react_router_6.3.0.tgz"; + path = fetchurl { + name = "react_router___react_router_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz"; + sha512 = "7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ=="; + }; + } { name = "react_select___react_select_4.3.1.tgz"; path = fetchurl { @@ -9673,6 +9857,14 @@ sha512 = "Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw=="; }; } + { + name = "react_transition_group___react_transition_group_4.4.2.tgz"; + path = fetchurl { + name = "react_transition_group___react_transition_group_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz"; + sha512 = "/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg=="; + }; + } { name = "react_transition_state___react_transition_state_1.1.3.tgz"; path = fetchurl { @@ -10865,6 +11057,14 @@ sha512 = "Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA=="; }; } + { + name = "stylis___stylis_4.0.13.tgz"; + path = fetchurl { + name = "stylis___stylis_4.0.13.tgz"; + url = "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz"; + sha512 = "xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag=="; + }; + } { name = "stylis___stylis_4.0.10.tgz"; path = fetchurl { @@ -11233,6 +11433,14 @@ sha1 = "yy4SAwZ+DI3h9hQJS5/kVwTqYAM="; }; } + { + name = "tslib___tslib_2.3.0.tgz"; + path = fetchurl { + name = "tslib___tslib_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz"; + sha512 = "N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="; + }; + } { name = "tslib___tslib_2.2.0.tgz"; path = fetchurl { From cf6b75adb05c0f03fa08ed4efd2f79e763f6effe Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 19 Apr 2022 21:28:33 +0200 Subject: [PATCH 2/8] pgadmin: fix pgadmin4 command --- pkgs/tools/admin/pgadmin/default.nix | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 50988681884e..9f2c5c085f1a 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -25,9 +25,27 @@ let yarnLock = ./yarn.lock; yarnNix = ./yarn.nix; }; + + 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 { + # Nothing of interest changed from 0.2 to 0.3 + doCheck = false; + }); + }); + in -python3.pkgs.buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { inherit pname version src; # from Dockerfile @@ -101,10 +119,10 @@ python3.pkgs.buildPythonApplication rec { cp -v ../pkg/pip/setup_pip.py setup.py ''; - nativeBuildInputs = [ python3 python3.pkgs.cython python3.pkgs.pip ]; + nativeBuildInputs = with pythonPackages; [ cython pip ]; buildInputs = [ zlib - python3.pkgs.wheel + pythonPackages.wheel ]; # tests need an own data, log directory @@ -112,7 +130,7 @@ python3.pkgs.buildPythonApplication rec { # checks will be run through nixos/tests doCheck = false; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with pythonPackages; [ flask flask-gravatar flask_login From 5cf8ef4ba41161531fcfaae7e02c2c616d6902a7 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Wed, 20 Apr 2022 00:37:08 +0200 Subject: [PATCH 3/8] pgadmin: add werkzeug override Signed-off-by: Florian Brandes --- pkgs/tools/admin/pgadmin/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 9f2c5c085f1a..77cfff9aa399 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -33,7 +33,7 @@ let inherit version; sha256 = "sha256-4RIMIoyi9VO0cN9KX6knq2YlhGdSYGmYGz6wqRkCaH0="; }; - disabledTests = (oldAttrs.disabledTests or []) ++ [ + disabledTests = (oldAttrs.disabledTests or [ ]) ++ [ "test_aborting" ]; }); @@ -41,6 +41,13 @@ let # Nothing of interest changed from 0.2 to 0.3 doCheck = false; }); + werkzeug = prev.werkzeug.overridePythonAttrs (oldAttrs: rec { + version = "2.0.3"; + src = oldAttrs.src.override { + inherit version; + sha256 = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw="; + }; + }); }); in From eff62ac1963df80205482aa6d40962f1abdfa832 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Wed, 20 Apr 2022 00:45:38 +0200 Subject: [PATCH 4/8] pgadmin4: make regression test use the same packages Signed-off-by: Florian Brandes --- nixos/tests/pgadmin4.nix | 125 ++++++++++++++++++++++++--------------- 1 file changed, 78 insertions(+), 47 deletions(-) diff --git a/nixos/tests/pgadmin4.nix b/nixos/tests/pgadmin4.nix index 2f6dc3bd569f..dd4be1d0616c 100644 --- a/nixos/tests/pgadmin4.nix +++ b/nixos/tests/pgadmin4.nix @@ -5,49 +5,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: pgadmin4Dir = "/var/lib/pgadmin"; pgadmin4LogDir = "/var/log/pgadmin"; - python-with-needed-packages = pkgs.python3.withPackages (ps: with ps; [ - selenium - testtools - testscenarios - flask - flask-babelex - flask-babel - flask-gravatar - flask_login - flask_mail - flask_migrate - flask_sqlalchemy - flask_wtf - flask-compress - passlib - pytz - simplejson - six - sqlparse - wtforms - flask-paranoid - psutil - psycopg2 - python-dateutil - sqlalchemy - itsdangerous - flask-security-too - bcrypt - cryptography - sshtunnel - ldap3 - gssapi - flask-socketio - eventlet - httpagentparser - user-agents - wheel - authlib - qrcode - pillow - pyotp - boto3 - ]); in { name = "pgadmin4"; @@ -55,12 +12,86 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: nodes.machine = { pkgs, ... }: { imports = [ ./common/x11.nix ]; + # needed because pgadmin 6.8 will fail, if those dependencies get updated + nixpkgs.overlays = [ + (self: super: { + pythonPackages = super.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 { + # Nothing of interest changed from 0.2 to 0.3 + doCheck = false; + }); + werkzeug = prev.werkzeug.overridePythonAttrs (oldAttrs: rec { + version = "2.0.3"; + src = oldAttrs.src.override { + inherit version; + sha256 = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw="; + }; + }); + }); + }) + ]; + environment.systemPackages = with pkgs; [ pgadmin4 postgresql - python-with-needed-packages chromedriver chromium + (python3.withPackages + (ps: with pythonPackages; [ + selenium + testtools + testscenarios + flask + flask-babelex + flask-babel + flask-gravatar + flask_login + flask_mail + flask_migrate + flask_sqlalchemy + flask_wtf + flask-compress + passlib + pytz + simplejson + six + sqlparse + wtforms + flask-paranoid + psutil + psycopg2 + python-dateutil + sqlalchemy + itsdangerous + flask-security-too + bcrypt + cryptography + sshtunnel + ldap3 + gssapi + flask-socketio + eventlet + httpagentparser + user-agents + wheel + authlib + qrcode + pillow + pyotp + boto3 + ]) + ) ]; services.postgresql = { enable = true; @@ -121,7 +152,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: with subtest("run browser test"): machine.succeed( 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \ - && ${python-with-needed-packages.interpreter} regression/runtests.py --pkg browser --exclude \ + && python regression/runtests.py --pkg browser --exclude \ browser.tests.test_ldap_login.LDAPLoginTestCase,browser.tests.test_ldap_login' ) @@ -131,13 +162,13 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: machine.succeed( 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \ && export FONTCONFIG_FILE=${pkgs.makeFontsConf { fontDirectories = [];}} \ - && ${python-with-needed-packages.interpreter} regression/runtests.py --pkg feature_tests' + && python regression/runtests.py --pkg feature_tests' ) with subtest("run resql test"): machine.succeed( 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \ - && ${python-with-needed-packages.interpreter} regression/runtests.py --pkg resql' + && python regression/runtests.py --pkg resql' ) ''; }) From eef222b8c2f220033fb76aa64cdfd9dcf9d6a3aa Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sun, 24 Apr 2022 13:17:42 +0200 Subject: [PATCH 5/8] pgadmin4: fix tests this commit passes the build dependencies to the pgadmin nixos test for package and regression testing. Also added changelog and some clarifying comments. Signed-off-by: Florian Brandes --- nixos/tests/pgadmin4.nix | 68 ++++++----------- pkgs/tools/admin/pgadmin/default.nix | 106 +++++++++++++++------------ 2 files changed, 82 insertions(+), 92 deletions(-) diff --git a/nixos/tests/pgadmin4.nix b/nixos/tests/pgadmin4.nix index dd4be1d0616c..6c37bc0502f3 100644 --- a/nixos/tests/pgadmin4.nix +++ b/nixos/tests/pgadmin4.nix @@ -1,4 +1,20 @@ -import ./make-test-python.nix ({ pkgs, lib, ... }: +import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], ... }: + + /* + This test suite replaces the typical pytestCheckHook function in python + packages. Pgadmin4 test suite needs a running and configured postgresql + server. This is why this test exists. + + To not repeat all the python dependencies needed, this test is called directly + from the pgadmin4 derivation, which also passes the currently + used propagatedBuildInputs. + + Unfortunately, there doesn't seem to be an easy way to otherwise include + the needed packages here. + + Also any python Overrides need to be duplicated here, too. + + */ let pgadmin4SrcDir = "/pgadmin"; @@ -47,50 +63,14 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: postgresql chromedriver chromium + # include the same packages as in pgadmin minus speaklater3 (python3.withPackages - (ps: with pythonPackages; [ - selenium - testtools - testscenarios - flask - flask-babelex - flask-babel - flask-gravatar - flask_login - flask_mail - flask_migrate - flask_sqlalchemy - flask_wtf - flask-compress - passlib - pytz - simplejson - six - sqlparse - wtforms - flask-paranoid - psutil - psycopg2 - python-dateutil - sqlalchemy - itsdangerous - flask-security-too - bcrypt - cryptography - sshtunnel - ldap3 - gssapi - flask-socketio - eventlet - httpagentparser - user-agents - wheel - authlib - qrcode - pillow - pyotp - boto3 - ]) + (ps: buildDeps ++ + [ + # test suite package requirements + pythonPackages.testscenarios + pythonPackages.selenium + ]) ) ]; services.postgresql = { diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 77cfff9aa399..8b40687ec0b3 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -1,17 +1,19 @@ -{ stdenv -, lib +{ lib , python3 , fetchurl , zlib , mkYarnModules , sphinx , nixosTests +, pkgs }: let pname = "pgadmin"; - version = "6.8"; + majorVersion = "6"; + minorVersion = "8"; + version = "${majorVersion}.${minorVersion}"; src = fetchurl { url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz"; @@ -26,6 +28,50 @@ let yarnNix = ./yarn.nix; }; + # move buildDeps here to easily pass to test suite + buildDeps = with pythonPackages; [ + flask + flask-gravatar + flask_login + flask_mail + flask_migrate + flask_sqlalchemy + flask_wtf + flask-compress + passlib + pytz + simplejson + six + sqlparse + wtforms + flask-paranoid + psutil + psycopg2 + python-dateutil + sqlalchemy + itsdangerous + flask-security-too + bcrypt + cryptography + sshtunnel + ldap3 + flask-babelex + flask-babel + gssapi + flask-socketio + eventlet + httpagentparser + user-agents + wheel + authlib + qrcode + pillow + pyotp + botocore + boto3 + ]; + + # override necessary on pgadmin4 6.8 pythonPackages = python3.pkgs.overrideScope (final: prev: rec { flask = prev.flask.overridePythonAttrs (oldAttrs: rec { version = "2.0.3"; @@ -68,7 +114,7 @@ pythonPackages.buildPythonApplication rec { postPatch = '' # patching Makefile, so it doesn't try to build sphinx documentation here # (will do so later) - substituteInPlace Makefile --replace "LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx html" "true" + substituteInPlace Makefile --replace 'LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx html' "true" # fix document which refers a non-existing document and fails substituteInPlace docs/en_US/contributions.rst --replace "code_snippets" "" patchShebangs . @@ -137,57 +183,21 @@ pythonPackages.buildPythonApplication rec { # checks will be run through nixos/tests doCheck = false; - propagatedBuildInputs = with pythonPackages; [ - flask - flask-gravatar - flask_login - flask_mail - flask_migrate - flask_sqlalchemy - flask_wtf - flask-compress - passlib - pytz - simplejson - six - speaklater3 - sqlparse - wtforms - flask-paranoid - psutil - psycopg2 - python-dateutil - sqlalchemy - itsdangerous - flask-security-too - bcrypt - cryptography - sshtunnel - ldap3 - flask-babelex - flask-babel - gssapi - flask-socketio - eventlet - httpagentparser - user-agents - wheel - authlib - qrcode - pillow - pyotp - botocore - boto3 - ]; + # speaklater3 is seperate because when passing buildDeps + # to the test, it fails there due to a collision with speaklater + propagatedBuildInputs = buildDeps ++ [pythonPackages.speaklater3]; - passthru = { - tests = { inherit (nixosTests) pgadmin4 pgadmin4-standalone; }; + passthru.tests = { + standalone = nixosTests.pgadmin4-standalone; + # regression and function tests of the package itself + package = (import ../../../../nixos/tests/pgadmin4.nix ({ inherit pkgs; buildDeps = buildDeps; })); }; meta = with lib; { description = "Administration and development platform for PostgreSQL"; homepage = "https://www.pgadmin.org/"; license = licenses.mit; + changelog = "https://www.pgadmin.org/docs/pgadmin4/latest/release_notes_${majorVersion}_${minorVersion}.html"; maintainers = with maintainers; [ gador ]; }; } From 0dd6926b29a4510d5e1d7540dd5d6a0fb485e578 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Wed, 27 Apr 2022 19:14:02 +0200 Subject: [PATCH 6/8] pgadmin: revert version string Signed-off-by: Florian Brandes --- pkgs/tools/admin/pgadmin/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 8b40687ec0b3..ac3af0c1edf9 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -11,9 +11,7 @@ let pname = "pgadmin"; - majorVersion = "6"; - minorVersion = "8"; - version = "${majorVersion}.${minorVersion}"; + version = "6.8"; src = fetchurl { url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz"; @@ -84,7 +82,7 @@ let ]; }); flask-paranoid = prev.flask-paranoid.overridePythonAttrs (oldAttrs: rec { - # Nothing of interest changed from 0.2 to 0.3 + # tests fail due to downgrades here doCheck = false; }); werkzeug = prev.werkzeug.overridePythonAttrs (oldAttrs: rec { @@ -185,7 +183,7 @@ pythonPackages.buildPythonApplication rec { # speaklater3 is seperate because when passing buildDeps # to the test, it fails there due to a collision with speaklater - propagatedBuildInputs = buildDeps ++ [pythonPackages.speaklater3]; + propagatedBuildInputs = buildDeps ++ [ pythonPackages.speaklater3 ]; passthru.tests = { standalone = nixosTests.pgadmin4-standalone; @@ -197,7 +195,7 @@ pythonPackages.buildPythonApplication rec { description = "Administration and development platform for PostgreSQL"; homepage = "https://www.pgadmin.org/"; license = licenses.mit; - changelog = "https://www.pgadmin.org/docs/pgadmin4/latest/release_notes_${majorVersion}_${minorVersion}.html"; + changelog = "https://www.pgadmin.org/docs/pgadmin4/latest/release_notes_${lib.versions.major}_${versions.minor}.html"; maintainers = with maintainers; [ gador ]; }; } From 709cc7066b631ebc7b97d7213385045985e6e6c9 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Thu, 28 Apr 2022 15:03:31 +0200 Subject: [PATCH 7/8] pgadmin4: pass pythonEnv as variable Signed-off-by: Florian Brandes --- nixos/tests/pgadmin4.nix | 32 +++++----------------------- pkgs/tools/admin/pgadmin/default.nix | 2 +- 2 files changed, 6 insertions(+), 28 deletions(-) diff --git a/nixos/tests/pgadmin4.nix b/nixos/tests/pgadmin4.nix index 6c37bc0502f3..b30299d307eb 100644 --- a/nixos/tests/pgadmin4.nix +++ b/nixos/tests/pgadmin4.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], ... }: +import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], ... }: /* This test suite replaces the typical pytestCheckHook function in python @@ -7,12 +7,13 @@ import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], ... }: To not repeat all the python dependencies needed, this test is called directly from the pgadmin4 derivation, which also passes the currently - used propagatedBuildInputs. + used propagatedBuildInputs and any python overrides. Unfortunately, there doesn't seem to be an easy way to otherwise include the needed packages here. - Also any python Overrides need to be duplicated here, too. + Due the the needed parameters a direct call to "nixosTests.pgadmin4" fails + and needs to be called as "pgadmin4.tests" */ @@ -31,30 +32,7 @@ import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], ... }: # needed because pgadmin 6.8 will fail, if those dependencies get updated nixpkgs.overlays = [ (self: super: { - pythonPackages = super.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 { - # Nothing of interest changed from 0.2 to 0.3 - doCheck = false; - }); - werkzeug = prev.werkzeug.overridePythonAttrs (oldAttrs: rec { - version = "2.0.3"; - src = oldAttrs.src.override { - inherit version; - sha256 = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw="; - }; - }); - }); + pythonPackages = pythonEnv; }) ]; diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index ac3af0c1edf9..974ec1cd00ef 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -188,7 +188,7 @@ pythonPackages.buildPythonApplication rec { passthru.tests = { standalone = nixosTests.pgadmin4-standalone; # regression and function tests of the package itself - package = (import ../../../../nixos/tests/pgadmin4.nix ({ inherit pkgs; buildDeps = buildDeps; })); + package = (import ../../../../nixos/tests/pgadmin4.nix ({ inherit pkgs; buildDeps = buildDeps; pythonEnv = pythonPackages; })); }; meta = with lib; { From 0c8e4f4f19094957758efb1be5ee4b1ebf524b45 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Thu, 28 Apr 2022 17:03:01 +0200 Subject: [PATCH 8/8] pgadmin: minor bugfix in version string Signed-off-by: Florian Brandes --- pkgs/tools/admin/pgadmin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 974ec1cd00ef..d917acd656c8 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -195,7 +195,7 @@ pythonPackages.buildPythonApplication rec { description = "Administration and development platform for PostgreSQL"; homepage = "https://www.pgadmin.org/"; license = licenses.mit; - changelog = "https://www.pgadmin.org/docs/pgadmin4/latest/release_notes_${lib.versions.major}_${versions.minor}.html"; + changelog = "https://www.pgadmin.org/docs/pgadmin4/latest/release_notes_${lib.versions.major version}_${lib.versions.minor version}.html"; maintainers = with maintainers; [ gador ]; }; }