Merge pull request #219164 from gador/pgadmin6.20 (f71c25b9) · Commits · nix / nixpkgs

pkgs/tools/admin/pgadmin/default.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -14,11 +14,11 @@

		let
		pname = "pgadmin";
		version = "6.19";
		version = "6.20";

		src = fetchurl {
		url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz";
		sha256 = "sha256-xHvdqVpNU9ZzTA6Xl2Bv044l6Tbvf4fjqyz4TmS9gmI=";
		sha256 = "sha256-6aQvg98LymZGAgAcNX5Xhw/aRdE5h4HOCPS+kQnkstU=";
		};

		yarnDeps = mkYarnModules {

pkgs/tools/admin/pgadmin/package.json

+4 −1

Original line number	Diff line number	Diff line
		@@ -150,6 +150,7 @@
		"react-draggable": "^4.4.4",
		"react-dropzone": "^14.2.1",
		"react-leaflet": "^3.2.2",
		"react-resize-detector": "^8.0.3",
		"react-rnd": "^10.3.5",
		"react-router-dom": "^6.2.2",
		"react-select": "^4.2.1",
		@@ -164,6 +165,8 @@
		"styled-components": "^5.2.1",
		"tempusdominus-bootstrap-4": "^5.1.2",
		"tempusdominus-core": "^5.19.3",
		"uplot": "^1.6.24",
		"uplot-react": "^1.1.4",
		"valid-filename": "^2.0.1",
		"webcabin-docker": "git+https://github.com/pgadmin-org/wcdocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8",
		"wkx": "^0.5.0",
		@@ -188,7 +191,7 @@
		"pep8": "pycodestyle --config=../.pycodestyle ../docs && pycodestyle --config=../.pycodestyle ../pkg && pycodestyle --config=../.pycodestyle ../tools && pycodestyle --config=../.pycodestyle ../web",
		"auditjs-html": "yarn audit --json \| yarn run yarn-audit-html --output ../auditjs.html",
		"auditjs": "yarn audit --groups dependencies",
		"auditpy": "safety check --full-report -i 40493 -i 51668",
		"auditpy": "safety check --full-report -i 51668 -i 52495",
		"audit": "yarn run auditjs && yarn run auditpy"
		}
		}

pkgs/tools/admin/pgadmin/yarn.lock

+20 −3

Original line number	Diff line number	Diff line
		@@ -8609,6 +8609,13 @@ react-property@2.0.0:
		resolved "https://registry.yarnpkg.com/react-property/-/react-property-2.0.0.tgz#2156ba9d85fa4741faf1918b38efc1eae3c6a136"
		integrity sha512-kzmNjIgU32mO4mmH5+iUyrqlpFQhF8K2k7eZ4fdLSOPFrD1XgEuSBv9LDEgxRXTMBqMd8ppT0x6TIzqE5pdGdw==

		react-resize-detector@^8.0.3:
		version "8.0.3"
		resolved "https://registry.yarnpkg.com/react-resize-detector/-/react-resize-detector-8.0.3.tgz#dab4470aae23bb07deb857230ccf945d000ef99b"
		integrity sha512-c3eqm5BVcluVhxHsBQnhyPO/5uYB3XHIHz6D1ZOHzU2WcnZF0Cr3KLl5OIozRC2RSsdQlu5vn1PHEqrvKRnIYA==
		dependencies:
		lodash "^4.17.21"

		react-rnd@^10.3.5:
		version "10.3.7"
		resolved "https://registry.yarnpkg.com/react-rnd/-/react-rnd-10.3.7.tgz#037ce277e6c5e682989b51278e44a6ba299990af"
		@@ -10084,9 +10091,9 @@ typescript@^3.2.2:
		integrity sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==

		ua-parser-js@^0.7.30:
		version "0.7.32"
		resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.32.tgz#cd8c639cdca949e30fa68c44b7813ef13e36d211"
		integrity sha512-f9BESNVhzlhEFf2CHMSj40NWOjYPl1YKYbrvIr/hFTDEmLq7SRbWvm7FcdcpCYT95zrOhC7gZSxjdnnTpBcwVw==
		version "0.7.33"
		resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.33.tgz#1d04acb4ccef9293df6f70f2c3d22f3030d8b532"
		integrity sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw==

		uglify-js@^3.1.4:
		version "3.17.4"
		@@ -10192,6 +10199,16 @@ update-browserslist-db@^1.0.9:
		escalade "^3.1.1"
		picocolors "^1.0.0"

		uplot-react@^1.1.4:
		version "1.1.4"
		resolved "https://registry.yarnpkg.com/uplot-react/-/uplot-react-1.1.4.tgz#02b9918a199da9983fc0d375fb44e443749e2ac0"
		integrity sha512-qO1UkQwjVKdj5vTm3O3yldvu1T6hwY4++rH4KznLhjqpnLdncq1zsRxq/zQz/HUHPVD0j7WBcEISbNM61JsuAQ==

		uplot@^1.6.24:
		version "1.6.24"
		resolved "https://registry.yarnpkg.com/uplot/-/uplot-1.6.24.tgz#dfa213fa7da92763261920ea972ed1a5f9f6af12"
		integrity sha512-WpH2BsrFrqxkMu+4XBvc0eCDsRBhzoq9crttYeSI0bfxpzR5YoSVzZXOKFVWcVC7sp/aDXrdDPbDZGCtck2PVg==

		uri-js@^4.2.2:
		version "4.4.1"
		resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"

pkgs/tools/admin/pgadmin/yarn.nix

+28 −4

Original line number	Diff line number	Diff line
		@@ -9223,6 +9223,14 @@
		sha512 = "kzmNjIgU32mO4mmH5+iUyrqlpFQhF8K2k7eZ4fdLSOPFrD1XgEuSBv9LDEgxRXTMBqMd8ppT0x6TIzqE5pdGdw==";
		};
		}
		{
		name = "react_resize_detector___react_resize_detector_8.0.3.tgz";
		path = fetchurl {
		name = "react_resize_detector___react_resize_detector_8.0.3.tgz";
		url = "https://registry.yarnpkg.com/react-resize-detector/-/react-resize-detector-8.0.3.tgz";
		sha512 = "c3eqm5BVcluVhxHsBQnhyPO/5uYB3XHIHz6D1ZOHzU2WcnZF0Cr3KLl5OIozRC2RSsdQlu5vn1PHEqrvKRnIYA==";
		};
		}
		{
		name = "react_rnd___react_rnd_10.3.7.tgz";
		path = fetchurl {
		@@ -10912,11 +10920,11 @@
		};
		}
		{
		name = "ua_parser_js___ua_parser_js_0.7.32.tgz";
		name = "ua_parser_js___ua_parser_js_0.7.33.tgz";
		path = fetchurl {
		name = "ua_parser_js___ua_parser_js_0.7.32.tgz";
		url = "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.32.tgz";
		sha512 = "f9BESNVhzlhEFf2CHMSj40NWOjYPl1YKYbrvIr/hFTDEmLq7SRbWvm7FcdcpCYT95zrOhC7gZSxjdnnTpBcwVw==";
		name = "ua_parser_js___ua_parser_js_0.7.33.tgz";
		url = "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.33.tgz";
		sha512 = "s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw==";
		};
		}
		{
		@@ -11047,6 +11055,22 @@
		sha512 = "OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==";
		};
		}
		{
		name = "uplot_react___uplot_react_1.1.4.tgz";
		path = fetchurl {
		name = "uplot_react___uplot_react_1.1.4.tgz";
		url = "https://registry.yarnpkg.com/uplot-react/-/uplot-react-1.1.4.tgz";
		sha512 = "qO1UkQwjVKdj5vTm3O3yldvu1T6hwY4++rH4KznLhjqpnLdncq1zsRxq/zQz/HUHPVD0j7WBcEISbNM61JsuAQ==";
		};
		}
		{
		name = "uplot___uplot_1.6.24.tgz";
		path = fetchurl {
		name = "uplot___uplot_1.6.24.tgz";
		url = "https://registry.yarnpkg.com/uplot/-/uplot-1.6.24.tgz";
		sha512 = "WpH2BsrFrqxkMu+4XBvc0eCDsRBhzoq9crttYeSI0bfxpzR5YoSVzZXOKFVWcVC7sp/aDXrdDPbDZGCtck2PVg==";
		};
		}
		{
		name = "uri_js___uri_js_4.4.1.tgz";
		path = fetchurl {