From a8639cffe98915e361198f05afdcbd1dab14f637 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Tue, 21 Mar 2023 13:19:03 +0100 Subject: [PATCH] pgadmin4: 6.20 -> 6.21 Signed-off-by: Florian Brandes --- pkgs/tools/admin/pgadmin/default.nix | 8 ++++---- pkgs/tools/admin/pgadmin/package.json | 1 - pkgs/tools/admin/pgadmin/yarn.lock | 7 ------- pkgs/tools/admin/pgadmin/yarn.nix | 8 -------- 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index f016207de0b0..f488c5dcee5a 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -12,11 +12,11 @@ let pname = "pgadmin"; - version = "6.20"; + version = "6.21"; src = fetchurl { url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz"; - hash = "sha256-6aQvg98LymZGAgAcNX5Xhw/aRdE5h4HOCPS+kQnkstU="; + hash = "sha256-9ErMhxzixyiwcwcduLP63JfM3rNy0W/3w0b+BbQAjUA="; }; yarnDeps = mkYarnModules { @@ -53,7 +53,7 @@ let }; propagatedBuildInputs = [ prev.pytz ]; }); - # pgadmin 6.20 is incompatible with flask 2.2 + # pgadmin 6.21 is incompatible with flask 2.2 # https://redmine.postgresql.org/issues/7651 flask = prev.flask.overridePythonAttrs (oldAttrs: rec { version = "2.1.3"; @@ -87,7 +87,7 @@ let hash = "sha256-NP5cb+4PabUOMPgaO36haqFJKncf6a0JdNFkYQwJpsk="; }; }); - # pgadmin 6.20 is incompatible with the major flask-security-too update to 5.0.x + # pgadmin 6.21 is incompatible with the major flask-security-too update to 5.0.x flask-security-too = prev.flask-security-too.overridePythonAttrs (oldAttrs: rec { version = "4.1.5"; src = oldAttrs.src.override { diff --git a/pkgs/tools/admin/pgadmin/package.json b/pkgs/tools/admin/pgadmin/package.json index f43473b081cd..17060850a0bc 100644 --- a/pkgs/tools/admin/pgadmin/package.json +++ b/pkgs/tools/admin/pgadmin/package.json @@ -124,7 +124,6 @@ "jquery": "^3.6.0", "json-bignumber": "^1.0.1", "jsoneditor": "^9.5.4", - "jsoneditor-react": "^3.1.1", "karma-coverage": "^2.0.3", "leaflet": "^1.5.1", "lodash": "4.*", diff --git a/pkgs/tools/admin/pgadmin/yarn.lock b/pkgs/tools/admin/pgadmin/yarn.lock index f506196c2040..e1f422834088 100644 --- a/pkgs/tools/admin/pgadmin/yarn.lock +++ b/pkgs/tools/admin/pgadmin/yarn.lock @@ -6235,13 +6235,6 @@ json5@^2.1.2, json5@^2.2.1: resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" integrity "sha1-eM1vGhm9wStz21rQxh79ZsHikoM= sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==" -jsoneditor-react@^3.1.1: - version "3.1.2" - resolved "https://registry.yarnpkg.com/jsoneditor-react/-/jsoneditor-react-3.1.2.tgz#bc36356ac5ecb0d8f88d49a5ccbeecdd7f996164" - integrity sha512-XqU8BMdIhrlS5HUnn7rGhgZw315bdJGQrf6NG5UH40FSw2xNirQrxnM05aeAplHkp8FNkzN2WX0tfvEWdl2UUA== - dependencies: - prop-types "^15.7.2" - jsoneditor@^9.5.4: version "9.9.2" resolved "https://registry.yarnpkg.com/jsoneditor/-/jsoneditor-9.9.2.tgz#176112f71acbf37e977aae8656a17bc33a7a4269" diff --git a/pkgs/tools/admin/pgadmin/yarn.nix b/pkgs/tools/admin/pgadmin/yarn.nix index 0dc8367c7ca2..7f4b07621457 100644 --- a/pkgs/tools/admin/pgadmin/yarn.nix +++ b/pkgs/tools/admin/pgadmin/yarn.nix @@ -6529,14 +6529,6 @@ sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="; }; } - { - name = "jsoneditor_react___jsoneditor_react_3.1.2.tgz"; - path = fetchurl { - name = "jsoneditor_react___jsoneditor_react_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/jsoneditor-react/-/jsoneditor-react-3.1.2.tgz"; - sha512 = "XqU8BMdIhrlS5HUnn7rGhgZw315bdJGQrf6NG5UH40FSw2xNirQrxnM05aeAplHkp8FNkzN2WX0tfvEWdl2UUA=="; - }; - } { name = "jsoneditor___jsoneditor_9.9.2.tgz"; path = fetchurl {