Pgadmin update 6.8, fix build breakage on master #169370

gador · 2022-04-19T22:54:16Z

Description of changes

Update to the new release.
This fixes a regression tracked in #169322.

Unfortunately, the recent update of flask and werkzeug cause a build failure.

This makes the override necessary. Since pgadmin4 isn't imported anywhere else (a leaflet), it shouldn't cause inconsistent python environments.

I haven't figured out a way to nicely import the different pythonScope in the test suite for the regression testing and had to do with overlays.

Thanks @FRidh for the pointer to overrideScope ! (Maybe it is worthwhile adding that to the manual..) and to @teto for the initial bug report.

Things done

mweinelt · 2022-04-20T12:42:03Z

Apparently pgadmin4 6.7 (odd versioning 🤔) built without these overrides over in #169434.

gador · 2022-04-20T15:45:17Z

Yes. It builds. But it doesn't start and the tests in nixos fail.

Due to the nature of the tests, they cannot be included as tests in the main package..

FRidh · 2022-04-20T19:45:03Z

Thanks @FRidh for the pointer to overrideScope ! (Maybe it is worthwhile adding that to the manual..) and to @teto for the initial bug report.

Actually, it's not there because it doesn't work or give you a buildEnv/withPackages. I see you worked around that now.

FRidh · 2022-04-20T19:47:49Z

nixos/tests/pgadmin4.nix

  in
  {
    name = "pgadmin4";
    meta.maintainers = with lib.maintainers; [ gador ];

    nodes.machine = { pkgs, ... }: {
      imports = [ ./common/x11.nix ];
+      # needed because pgadmin 6.8 will fail, if those dependencies get updated
+      nixpkgs.overlays = [


overriding is already done in the derivation, so why do it here as well

See the comment below.

Pgadmin is not wrapped with test only python packages

Pgadmin (the app) is wrapped, but not the tests. To run the python tests, a python environment is needed.

Please move this into the package possible behind a flag which builds it with test dependencies.

This is already in the package in L74ff (pgadmin4). The override in the python package set need to be in the package, as well as here in the test. (Or do you know any way to re-use the overrideScope between derivations?)

Adding a test-flag to the pgadmin4 derivation is more work and more confusing than just adding the two test packages here in L71-L72 (nixos/tests/pgadmin4).

If the overrideScope is required pgadmin should be not in pythonPackages and do them there. This will definitely bit rot over time and be forgotten when updating packages.
It also makes the test flawed and not well written because if it gets out of sync (which will definitely happen eventually) we are not testing what we are shipping.

So, if I understand you correctly, the nixpkgs.overlays must be removed here from the test and the overrideScope from the pgadmin.nix derivation must be imported here?

I really wrestled a long time with this (see #169370 (comment)) and this is the only way I got it to work. Any pointers of including the overrideScope from the pgadmin.nix into this test environment would be greatly appreciated.

Ok, apparently I work better when its not late at night. I gave it a try to pass the python environment to the test from the derivation. Id appreciate a second (or third, forth...) look ;-)

So, if I understand you correctly, the nixpkgs.overlays must be removed here from the test and the overrideScope from the pgadmin.nix derivation must be imported here?

I took a second, deeper look and how it is right now not necessarily but if you would run the test standalone it wouldn't use the python env from pgadmin, so we still need to change it.

I think the easiest way would be to passthru the right things from pgadmin and use them in the test.

Ok, I think I did that.

The testcall to standalone is left as it is. The imported pgadmin package there is the one with the built-in python overrides.
The testcall to package is changed to pass the python environment.

This way we only have to change it in one place.

@SuperSandro2000
Do you have time for (yet) another look?

nixos/tests/pgadmin4.nix

gador · 2022-04-24T11:23:34Z

@FRidh could you take another look? Thanks 😄

nixos-discourse · 2022-04-27T12:17:37Z

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/833

pkgs/tools/admin/pgadmin/default.nix

Signed-off-by: Florian Brandes <[email protected]>

this commit passes the build dependencies to the pgadmin nixos test for package and regression testing. Also added changelog and some clarifying comments. Signed-off-by: Florian Brandes <[email protected]>

Signed-off-by: Florian Brandes <[email protected]>

nixos-discourse · 2022-05-06T07:13:14Z

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/pgadmin4-fails-to-start/19004/4

github-actions bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Apr 19, 2022

gador force-pushed the pgadmin-update-6.8 branch from 8fc0ae5 to e47b264 Compare April 19, 2022 23:00

ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Apr 19, 2022

gador requested a review from mweinelt April 20, 2022 09:35

gador mentioned this pull request Apr 20, 2022

python3Packages.flask-security-too: 4.1.3 -> 4.1.4 #169434

Merged

13 tasks

FRidh mentioned this pull request Apr 20, 2022

pgadmin: fix pgadmin4 command, fixes #169322 #169354

Closed

13 tasks

FRidh reviewed Apr 20, 2022

View reviewed changes

gador requested a review from FRidh April 22, 2022 06:49

gador force-pushed the pgadmin-update-6.8 branch from 622c3ee to 09a39ca Compare April 24, 2022 12:26

SuperSandro2000 requested changes Apr 27, 2022

View reviewed changes

pkgs/tools/admin/pgadmin/default.nix Outdated Show resolved Hide resolved

pkgs/tools/admin/pgadmin/default.nix Outdated Show resolved Hide resolved

gador and others added 6 commits April 27, 2022 19:15

pgadmin4: 6.7 -> 6.8

fa01814

Signed-off-by: Florian Brandes <[email protected]>

pgadmin: fix pgadmin4 command

cf6b75a

pgadmin: add werkzeug override

5cf8ef4

Signed-off-by: Florian Brandes <[email protected]>

pgadmin4: make regression test use the same packages

eff62ac

Signed-off-by: Florian Brandes <[email protected]>

pgadmin4: fix tests

eef222b

this commit passes the build dependencies to the pgadmin nixos test for package and regression testing. Also added changelog and some clarifying comments. Signed-off-by: Florian Brandes <[email protected]>

pgadmin: revert version string

0dd6926

Signed-off-by: Florian Brandes <[email protected]>

gador force-pushed the pgadmin-update-6.8 branch from 09a39ca to 0dd6926 Compare April 27, 2022 18:30

gador requested a review from SuperSandro2000 April 27, 2022 18:39

gador added 2 commits April 28, 2022 15:03

pgadmin4: pass pythonEnv as variable

709cc70

Signed-off-by: Florian Brandes <[email protected]>

pgadmin: minor bugfix in version string

0c8e4f4

Signed-off-by: Florian Brandes <[email protected]>

gador force-pushed the pgadmin-update-6.8 branch from e447df6 to 0c8e4f4 Compare April 28, 2022 15:35

SuperSandro2000 merged commit 451e27e into NixOS:master May 4, 2022

gador mentioned this pull request Jul 15, 2022

Pgadmin 6.11 #179994

Merged

13 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Pgadmin update 6.8, fix build breakage on master #169370

Pgadmin update 6.8, fix build breakage on master #169370

gador commented Apr 19, 2022

mweinelt commented Apr 20, 2022 •

edited

Loading

gador commented Apr 20, 2022

FRidh commented Apr 20, 2022 •

edited

Loading

FRidh Apr 20, 2022

gador Apr 20, 2022

SuperSandro2000 Apr 27, 2022

gador Apr 27, 2022

SuperSandro2000 Apr 28, 2022 •

edited

Loading

gador Apr 28, 2022

gador Apr 28, 2022

SuperSandro2000 Apr 28, 2022

gador Apr 28, 2022

gador May 3, 2022

gador commented Apr 24, 2022

nixos-discourse commented Apr 27, 2022

nixos-discourse commented May 6, 2022

Pgadmin update 6.8, fix build breakage on master #169370

Pgadmin update 6.8, fix build breakage on master #169370

Conversation

gador commented Apr 19, 2022

Description of changes

Things done

mweinelt commented Apr 20, 2022 • edited Loading

gador commented Apr 20, 2022

FRidh commented Apr 20, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SuperSandro2000 Apr 28, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gador commented Apr 24, 2022

nixos-discourse commented Apr 27, 2022

nixos-discourse commented May 6, 2022

mweinelt commented Apr 20, 2022 •

edited

Loading

FRidh commented Apr 20, 2022 •

edited

Loading

SuperSandro2000 Apr 28, 2022 •

edited

Loading