diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2022-04-19 21:28:33 +0200 |
|---|---|---|
| committer | Florian Brandes <florian.brandes@posteo.de> | 2022-04-27 19:15:08 +0200 |
| commit | cf6b75adb05c0f03fa08ed4efd2f79e763f6effe (patch) | |
| tree | 578a0f0496adab82140ec4c381fd5508c90b4cd6 /pkgs/tools/admin/pgadmin | |
| parent | fa01814245e0f6a4dedb720027db87923a404ad3 (diff) | |
pgadmin: fix pgadmin4 command
Diffstat (limited to 'pkgs/tools/admin/pgadmin')
| -rw-r--r-- | pkgs/tools/admin/pgadmin/default.nix | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 50988681884e7..9f2c5c085f1a8 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -25,9 +25,27 @@ let yarnLock = ./yarn.lock; yarnNix = ./yarn.nix; }; + + pythonPackages = python3.pkgs.overrideScope (final: prev: rec { + flask = prev.flask.overridePythonAttrs (oldAttrs: rec { + version = "2.0.3"; + src = oldAttrs.src.override { + inherit version; + sha256 = "sha256-4RIMIoyi9VO0cN9KX6knq2YlhGdSYGmYGz6wqRkCaH0="; + }; + disabledTests = (oldAttrs.disabledTests or []) ++ [ + "test_aborting" + ]; + }); + flask-paranoid = prev.flask-paranoid.overridePythonAttrs (oldAttrs: rec { + # Nothing of interest changed from 0.2 to 0.3 + doCheck = false; + }); + }); + in -python3.pkgs.buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { inherit pname version src; # from Dockerfile @@ -101,10 +119,10 @@ python3.pkgs.buildPythonApplication rec { cp -v ../pkg/pip/setup_pip.py setup.py ''; - nativeBuildInputs = [ python3 python3.pkgs.cython python3.pkgs.pip ]; + nativeBuildInputs = with pythonPackages; [ cython pip ]; buildInputs = [ zlib - python3.pkgs.wheel + pythonPackages.wheel ]; # tests need an own data, log directory @@ -112,7 +130,7 @@ python3.pkgs.buildPythonApplication rec { # checks will be run through nixos/tests doCheck = false; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with pythonPackages; [ flask flask-gravatar flask_login |