Commit Graph

3159 Commits

Author SHA1 Message Date
Nick Cao
6fa2bfdf4d
Merge pull request #215110 from gador/pgadmin-use-pstgresqltesthook
pgadmin4-desktopmode: init at 6.19, pgadmin4: simplify tests
2023-02-09 16:05:44 +08:00
Florian Brandes
a380674d85
pgadmin4: add option to enable desktop mode
By default, pgadmin4 uses SERVER_MODE = True. This requires
access to system directories (e.g. /var/lib/pgadmin). There is
no easy way to change this mode during runtime. One has to change
or add config files withing pgadmin's directory structure to change it
or add a system-wide config file under `/etc/pgadmin`[1].

This isn't always easy to achive or may not be possible at all. For
those usecases this implements a switch in the pgadmin4 derivation and
adds a new top-level package `pgadmin4-desktopmode`. This builds in
DESKTOP MODE and allows the usage of pgadmin4 without the nixOS module
and without access to system-wide directories.

pgadmin4 module saves the configuration to /etc/pgadmin/config_system.py
pgadmin4-desktopmode tries to read that as well. This normally fails with
a PermissionError, as the config file is owned by the user of the pgadmin module.

With the check-system-config-dir.patch this will just throw a warning
but will continue and not read the file.

If we run pgadmin4-desktopmode as root
(something one really shouldn't do), it can read the config file and fail,
because of the wrong config for desktopmode.

[1]https://www.pgadmin.org/docs/pgadmin4/latest/config_py.html

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-02-09 08:19:05 +01:00
Florian Brandes
e4488f5efe pgadmin4: move package tests back into the package
We test pgadmin in nixosTests, because it needs a running postgresql instance.
This is now unnecessary since we can do so in the package itself.

This reduces the complexity of pgadmin and removes the need for the extra
nixosTests.

Also setting SERVER_MODE in `pkg/pip/setup_pip.py` does not have any effect
on the final package, so we remove it.
In NixOS, we use the module, which expects SERVER_MODE to be true (which it defaults to).
In non-NixOS installations, we will need the directory /var/lib/pgadmin and /var/log/pgadmin

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-02-09 08:06:52 +01:00
Nick Cao
853288c39d
Merge pull request #215186 from Trundle/pulumi-3.54.0
pulumi: 3.53.1 -> 3.54.0
2023-02-09 08:58:39 +08:00
James Walker
f5b9d5d0e2
pulumi-bin: 3.53.1 -> 3.54.0 2023-02-08 12:06:51 -05:00
Andreas Stührk
ed2404945a pulumi: 3.53.1 -> 3.54.0 2023-02-07 22:15:45 +01:00
Weijia Wang
e1e2a8f671
Merge pull request #214972 from jfly/issue-211415-disable-failing-mycli-test
mycli: skip broken test
2023-02-07 17:16:43 +01:00
Sandro
2b013e9bc2
Merge pull request #212982 from gador/pgadmin-6.19 2023-02-06 22:29:11 +01:00
Jeremy Fleischman
fd6c52733b
mycli: skip broken test
While I was in here, I ported this code to use `pytestCheckHook`.

This fixes https://github.com/NixOS/nixpkgs/issues/211415 (maybe this is
more of a workaround?).

This build was failing due to a broken test upstream. I've instructed
nix to skip that test for now.

I also changed the `py.test` to plain `pytest`. I'm not familiar with
the difference, but according to [this SO
answer](https://stackoverflow.com/a/41893170/1739415), it sounds like
`pytest` is the new hotness and should be used wherever possible.
2023-02-06 12:59:22 -08:00
Weijia Wang
11e9c497aa
Merge pull request #214858 from r-ryantm/auto-update/awscli2
awscli2: 2.9.19 -> 2.9.21
2023-02-06 10:44:52 +01:00
R. Ryantm
eecccb4262 awscli2: 2.9.19 -> 2.9.21 2023-02-06 01:25:27 +00:00
Mario Rodas
fe4f28b807 syft: 0.69.1 -> 0.70.0
https://github.com/anchore/syft/releases/tag/v0.70.0
2023-02-05 20:30:00 +00:00
R. Ryantm
5e609b2a02 syft: 0.69.0 -> 0.69.1 2023-02-05 20:29:42 +00:00
Malte Voos
3449f83618 maintainers/malvo: update information 2023-02-05 15:05:51 +01:00
Weijia Wang
65399d1bf5
Merge pull request #214510 from r-ryantm/auto-update/kics
kics: 1.6.8 -> 1.6.9
2023-02-05 04:45:16 +01:00
R. Ryantm
8618ebf1b4 eksctl: 0.127.0 -> 0.128.0 2023-02-05 02:28:08 +00:00
R. Ryantm
7162b71480 kics: 1.6.8 -> 1.6.9 2023-02-04 08:25:24 +00:00
Florian Brandes
cfc77dc410 pgadmin4: 6.18 -> 6.19
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-02-03 12:29:30 +01:00
Nick Cao
5edd519b14
Merge pull request #214311 from gador/pgadmin-pin-flask-babel
pgadmin: pin flask-babel to fix build failure
2023-02-03 19:12:10 +08:00
Artturi
18294fe13d
Merge pull request #214334 from 06kellyjac/trivy 2023-02-03 12:20:05 +02:00
Florian Brandes
cc86457eca
pgadmin: pin flask-babel to fix build failure
pgadmin needs an older version of flask-security-too, which
is incompatible with the update of flask-babel.

This commit pins the version.

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-02-03 07:49:51 +01:00
Fabian Affolter
bcb6dc0fbb qovery-cli: 0.48.5 -> 0.48.6
Changelog: https://github.com/Qovery/qovery-cli/releases/tag/v0.48.6
2023-02-02 22:18:25 +01:00
06kellyjac
2c878fc0cc trivy: 0.36.1 -> 0.37.1
Diff: https://github.com/aquasecurity/trivy/compare/v0.36.1...v0.37.1

Changelog: https://github.com/aquasecurity/trivy/releases/tag/v0.37.1
2023-02-02 11:48:53 +00:00
Weijia Wang
af2735dfb2
Merge pull request #213716 from aaronjheng/syft
syft: 0.68.1 -> 0.69.0
2023-01-31 11:33:29 +01:00
Aaron Jheng
59ea669300
syft: 0.68.1 -> 0.69.0 2023-01-31 09:47:44 +00:00
R. Ryantm
fbbaf6d844 procs: 0.13.3 -> 0.13.4 2023-01-31 05:27:15 +00:00
Weijia Wang
c6daa99012
Merge pull request #213614 from r-ryantm/auto-update/eksctl
eksctl: 0.126.0 -> 0.127.0
2023-01-30 21:03:57 +01:00
R. Ryantm
3601988cae eksctl: 0.126.0 -> 0.127.0 2023-01-30 17:50:56 +00:00
R. Ryantm
f2c346f4cf awscli2: 2.9.18 -> 2.9.19 2023-01-30 05:36:27 +00:00
Mario Rodas
aa4b41e1a4
Merge pull request #213247 from r-ryantm/auto-update/infra
infra: 0.20.0 -> 0.21.0
2023-01-29 09:25:44 -05:00
James Walker
cf026c8324
pulumi-bin: 3.51.1 -> 3.53.1 2023-01-28 20:32:17 -05:00
R. Ryantm
e08e34d0fd infra: 0.20.0 -> 0.21.0 2023-01-28 23:22:39 +00:00
R. Ryantm
5c169ec5be syft: 0.66.2 -> 0.68.1 2023-01-28 05:48:54 +00:00
Mario Rodas
7eb6a14326
Merge pull request #212903 from r-ryantm/auto-update/clair
clair: 4.5.1 -> 4.6.0
2023-01-27 08:06:50 -05:00
R. Ryantm
dd75400285 clair: 4.5.1 -> 4.6.0 2023-01-27 05:35:32 +00:00
Andreas Stührk
816d2cda30 pulumi: 3.52.0 -> 3.53.1 2023-01-26 22:31:05 +01:00
Weijia Wang
1888347629
Merge pull request #212744 from fabaff/qovery-cli-bump
qovery-cli: 0.48.4 -> 0.48.5
2023-01-26 18:59:25 +01:00
Weijia Wang
aedc95590c
Merge pull request #212775 from r-ryantm/auto-update/awscli2
awscli2: 2.9.17 -> 2.9.18
2023-01-26 18:17:57 +01:00
Florian Brandes
941661c994
pgadmin: Fix build
- change `sha256` to `hash` in override

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-01-26 14:49:02 +01:00
R. Ryantm
e0db5ade06 awscli2: 2.9.17 -> 2.9.18 2023-01-26 12:52:16 +00:00
Fabian Affolter
76f53b1bb6 qovery-cli: 0.48.4 -> 0.48.5
Diff: https://github.com/Qovery/qovery-cli/compare/v0.48.4...v0.48.5

Changelog: https://github.com/Qovery/qovery-cli/releases/tag/v0.48.5
2023-01-26 10:21:30 +01:00
Adam Stephens
b640c476c5
lxd: 5.9 -> 5.10 2023-01-25 09:17:41 -05:00
Adam Stephens
0287788bb0
lxd: add adamcstephens as maintainer 2023-01-25 09:17:17 -05:00
Fabian Affolter
a61a5cb0ed
Merge pull request #212490 from r-ryantm/auto-update/awscli2
awscli2: 2.9.15 -> 2.9.17
2023-01-25 09:42:30 +01:00
techknowlogick
f7ccfb9191
scaleway-cli: 2.9.0 -> 2.10.0 (#212458)
Diff: https://github.com/scaleway/scaleway-cli/compare/v2.9.0...v2.10.0
2023-01-24 22:36:34 +00:00
R. Ryantm
039cace1a6 awscli2: 2.9.15 -> 2.9.17 2023-01-24 21:15:03 +00:00
Shawn8901
133fa5f867 treewide: remove global with lib; in pkgs/tools 2023-01-24 17:41:44 +01:00
Weijia Wang
f75bb079a0
Merge pull request #211871 from r-ryantm/auto-update/kics
kics: 1.6.7 -> 1.6.8
2023-01-23 22:09:24 +01:00
R. RyanTM
6040e7fe06
aws-vault: 6.6.1 -> 6.6.2 (#212301) 2023-01-23 21:42:31 +01:00
Sandro
cfa43f308a
Merge pull request #207179 from lionello/pulumi-bin-3.50.1
pulumi-bin: 3.49.0 -> 3.51.1
2023-01-23 12:09:45 +01:00