Unverified Commit 312d9a00 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #176560 from gador/pgadmin-6.10

parents 76ac5101 282eeff2

pkgs/tools/admin/pgadmin/default.nix

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


let

  pname = "pgadmin";

  version = "6.9";

  version = "6.10";



  src = fetchurl {

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

    sha256 = "sha256-C/0UDbPUuKCF9BBrDdlETGl7ALpFOmGaaxHVHxrIPVo=";

    sha256 = "sha256-wl7qC0p1NLX4+ulb4AGNPU6D0r838t6t/IYwJZcDnVQ=";

  };



  yarnDeps = mkYarnModules {
@@ -68,7 +68,7 @@ let 
    boto3

  ];



  # override necessary on pgadmin4 6.9

  # override necessary on pgadmin4 6.10

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

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

      version = "2.0.3";

pkgs/tools/admin/pgadmin/package.json

+4 −3
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ 
    "@types/react-dom": "^16.0.11",

    "ajv": "^8.8.2",

    "alertifyjs": "git+https://github.com/EnterpriseDB/AlertifyJS/#72c1d794f5b6d4ec13a68d123c08f19021afe263",

    "anti-trojan-source": "^1.4.0",

    "aspen-decorations": "^1.0.2",

    "axios": "^0.21.1",

    "babelify": "~10.0.0",
@@ -140,18 +141,18 @@ 
    "moment-timezone": "^0.5.34",

    "mousetrap": "^1.6.3",

    "notificar": "^1.0.1",

    "notistack": "^1.0.10",

    "notistack": "^2.0.0",

    "path-fx": "^2.0.0",

    "pathfinding": "^0.4.18",

    "paths-js": "^0.4.9",

    "pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#2c288ccc0ae0c98b41e56e79abf1204be3861702",

    "pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#b0287d39b54de28cb2a83f0c19a95ce823f6feae",

    "postcss": "^8.2.15",

    "raf": "^3.4.1",

    "rc-dock": "^3.2.9",

    "react": "^17.0.1",

    "react-aspen": "^1.1.0",

    "react-checkbox-tree": "^1.7.2",

    "react-data-grid": "git+https://github.com/adityatoshniwal/react-data-grid.git/#1dc310dfaf5afea359404e867b7cf54953f47d1e",

    "react-data-grid": "git+https://github.com/adityatoshniwal/react-data-grid.git/#8d9bc16ddd7c419acfbbd1c1cc2b70eb9f5b453c",

    "react-dom": "^17.0.1",

    "react-draggable": "^4.4.4",

    "react-leaflet": "^3.2.2",

pkgs/tools/admin/pgadmin/yarn.lock

+285 −10

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/tools/admin/pgadmin/yarn.nix

+318 −6

File changed.

Preview size limit exceeded, changes collapsed.