Unverified Commit 428a03f8 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #207406 from gador/pgadmin-6.18

parents b1ebdd3c b8e08c01

pkgs/tools/admin/pgadmin/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -10,11 +10,11 @@ 


let

  pname = "pgadmin";

  version = "6.17";

  version = "6.18";



  src = fetchurl {

    url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz";

    sha256 = "sha256-fcMNqki0namB5mRntlJUE9cN+axlw+7b8EA9aactlIw=";

    sha256 = "sha256-qqilmJLpJ3XNd8dwk7bDAAPxt8sou5zydFMPcJGcGoo=";

  };



  yarnDeps = mkYarnModules {
@@ -74,7 +74,7 @@ let 
  # keep the scope, as it is used throughout the derivation and tests

  # this also makes potential future overrides easier

  pythonPackages = python3.pkgs.overrideScope (final: prev: rec {

    # flask 2.2 is incompatible with pgadmin 6.15

    # flask 2.2 is incompatible with pgadmin 6.18

    # https://redmine.postgresql.org/issues/7651

    flask = prev.flask.overridePythonAttrs (oldAttrs: rec {

      version = "2.1.3";
@@ -83,7 +83,7 @@ let 
        sha256 = "sha256-FZcuUBffBXXD1sCQuhaLbbkCWeYgrI1+qBOjlrrVtss=";

      };

    });

    # pgadmin 6.15 is incompatible with the major flask-security-too update to 5.0.x

    # pgadmin 6.18 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 {
@@ -149,7 +149,7 @@ pythonPackages.buildPythonApplication rec { 
    do

      if [ -d ''${DIR}_build/html ]; then

          mkdir -p ../pip-build/pgadmin4/docs/''${DIR}_build

          cp -Rv ''${DIR}_build/html ../pip-build/pgadmin4/docs/''${DIR}_build

          cp -R ''${DIR}_build/html ../pip-build/pgadmin4/docs/''${DIR}_build

      fi

    done

    cd ../

pkgs/tools/admin/pgadmin/package.json

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,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",

    "auditpy": "safety check --full-report -i 40493 -i 51668",

    "audit": "yarn run auditjs && yarn run auditpy"

  }

}

pkgs/tools/admin/pgadmin/yarn.lock

+3 −3
Original line number Diff line number Diff line
@@ -3797,9 +3797,9 @@ decamelize@^5.0.0: 
  integrity sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA==



decode-uri-component@^0.2.0:

  version "0.2.0"

  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"

  integrity sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==

  version "0.2.2"

  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"

  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==



decompress-response@^3.2.0, decompress-response@^3.3.0:

  version "3.3.0"

pkgs/tools/admin/pgadmin/yarn.nix

+4 −4
Original line number Diff line number Diff line
@@ -3834,11 +3834,11 @@ 
      };

    }

    {

      name = "decode_uri_component___decode_uri_component_0.2.0.tgz";

      name = "decode_uri_component___decode_uri_component_0.2.2.tgz";

      path = fetchurl {

        name = "decode_uri_component___decode_uri_component_0.2.0.tgz";

        url  = "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz";

        sha512 = "hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==";

        name = "decode_uri_component___decode_uri_component_0.2.2.tgz";

        url  = "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz";

        sha512 = "FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==";

      };

    }

    {