pyrox.dev
Merge pull request #207406 from gador/pgadmin-6.18
+5
-5
pkgs/tools/admin/pgadmin/default.nix
+5
-5
pkgs/tools/admin/pgadmin/default.nix
···
10
10
11
11
let
12
12
pname = "pgadmin";
13
-
version = "6.17";
13
+
version = "6.18";
14
14
15
15
src = fetchurl {
16
16
url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz";
17
-
sha256 = "sha256-fcMNqki0namB5mRntlJUE9cN+axlw+7b8EA9aactlIw=";
17
+
sha256 = "sha256-qqilmJLpJ3XNd8dwk7bDAAPxt8sou5zydFMPcJGcGoo=";
18
18
};
19
19
20
20
yarnDeps = mkYarnModules {
···
74
74
# keep the scope, as it is used throughout the derivation and tests
75
75
# this also makes potential future overrides easier
76
76
pythonPackages = python3.pkgs.overrideScope (final: prev: rec {
77
-
# flask 2.2 is incompatible with pgadmin 6.15
77
+
# flask 2.2 is incompatible with pgadmin 6.18
78
78
# https://redmine.postgresql.org/issues/7651
79
79
flask = prev.flask.overridePythonAttrs (oldAttrs: rec {
80
80
version = "2.1.3";
···
83
83
sha256 = "sha256-FZcuUBffBXXD1sCQuhaLbbkCWeYgrI1+qBOjlrrVtss=";
84
84
};
85
85
});
86
-
# pgadmin 6.15 is incompatible with the major flask-security-too update to 5.0.x
86
+
# pgadmin 6.18 is incompatible with the major flask-security-too update to 5.0.x
87
87
flask-security-too = prev.flask-security-too.overridePythonAttrs (oldAttrs: rec {
88
88
version = "4.1.5";
89
89
src = oldAttrs.src.override {
···
149
149
do
150
150
if [ -d ''${DIR}_build/html ]; then
151
151
mkdir -p ../pip-build/pgadmin4/docs/''${DIR}_build
152
-
cp -Rv ''${DIR}_build/html ../pip-build/pgadmin4/docs/''${DIR}_build
152
+
cp -R ''${DIR}_build/html ../pip-build/pgadmin4/docs/''${DIR}_build
153
153
fi
154
154
done
155
155
cd ../
+1
-1
pkgs/tools/admin/pgadmin/package.json
+1
-1
pkgs/tools/admin/pgadmin/package.json
···
192
192
"pep8": "pycodestyle --config=../.pycodestyle ../docs && pycodestyle --config=../.pycodestyle ../pkg && pycodestyle --config=../.pycodestyle ../tools && pycodestyle --config=../.pycodestyle ../web",
193
193
"auditjs-html": "yarn audit --json | yarn run yarn-audit-html --output ../auditjs.html",
194
194
"auditjs": "yarn audit --groups dependencies",
195
-
"auditpy": "safety check --full-report -i 40493",
195
+
"auditpy": "safety check --full-report -i 40493 -i 51668",
196
196
"audit": "yarn run auditjs && yarn run auditpy"
197
197
}
198
198
}
+3
-3
pkgs/tools/admin/pgadmin/yarn.lock
+3
-3
pkgs/tools/admin/pgadmin/yarn.lock
···
3797
3797
integrity sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA==
3798
3798
3799
3799
decode-uri-component@^0.2.0:
3800
-
version "0.2.0"
3801
-
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
3802
-
integrity sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==
3800
+
version "0.2.2"
3801
+
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
3802
+
integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
3803
3803
3804
3804
decompress-response@^3.2.0, decompress-response@^3.3.0:
3805
3805
version "3.3.0"
+4
-4
pkgs/tools/admin/pgadmin/yarn.nix
+4
-4
pkgs/tools/admin/pgadmin/yarn.nix
···
3834
3834
};
3835
3835
}
3836
3836
{
3837
-
name = "decode_uri_component___decode_uri_component_0.2.0.tgz";
3837
+
name = "decode_uri_component___decode_uri_component_0.2.2.tgz";
3838
3838
path = fetchurl {
3839
-
name = "decode_uri_component___decode_uri_component_0.2.0.tgz";
3840
-
url = "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz";
3841
-
sha512 = "hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==";
3839
+
name = "decode_uri_component___decode_uri_component_0.2.2.tgz";
3840
+
url = "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz";
3841
+
sha512 = "FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==";
3842
3842
};
3843
3843
}
3844
3844
{