Commit graph

51 commits

Author SHA1 Message Date
Florian Brandes c3c2b4769e
pgadmin4: remove color from update script, redirect output
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-05-23 20:16:47 +02:00
Florian Brandes 123c8e3fa8
pgadmin4: remove comments and add exit trap to update.sh
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-05-19 22:29:35 +02:00
Florian Brandes cc3bec8ffe pgadmin4: add update script
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-05-18 09:59:43 +02:00
Florian Brandes fa770eff59
pgadmin4: 7.0 -> 7.1
Upstream has changed their `yarn.lock` file format to v2.
This introduces complications with nixpkgs, which needs the v1
file format. There is also a number of problems with the v2 version
(e.g. reproducibility or missing integrity fields) which makes the
direct use of v2 lockfile impossible.

Due to this change, we will need to convert the lockfile beforehand
and add it to nixpkgs. Due to issues with reproducibility it isn't
feasable to convert the lockfile within the `pgadmin` derivation.

For this commit I added the converted `yarn.lock` file and will add the
corresponding update script, once #231687 has been merged. (This adds
the tool to convert most of the v2 file to v1 and adds metadata to the
lockfile)

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-05-15 10:59:39 +02:00
Florian Brandes 8cad3dbe48
pgadmin4: fix build
since the new release of 7.0, the `generated` directory isn't included
in the tarball anymore. This commit will build the frontend so
pgadmin can function again.

Fixes https://github.com/NixOS/nixpkgs/pull/226675#issuecomment-1529033940

Also this commit will switch to the Github source and will not
need the package.json and yarn.{lock,nix} files anymore, since the
mkYarnModules part has been removed.

Also, since we don't depend on those files anymore and we switched
to Github, the `update.sh` script has been superseeded and isn't
needed anymore.

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-04-30 23:34:47 +02:00
Florian Brandes 39dc9a9f2c pgadmin4: 6.21 -> 7.0
Changelog: https://www.pgadmin.org/docs/pgadmin4/latest/release_notes_7_0.html

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-04-21 11:04:26 +02:00
Florian Brandes a8639cffe9
pgadmin4: 6.20 -> 6.21
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-03-21 13:19:03 +01:00
Florian Brandes d7d7cb0ab1 pgadmin4: fix python dependency hell
due to upstreams fix on old versions of flask and
flask-security-too, we'll need to pin other older versions, too.

Also fix extra_require bug with requirements.txt

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-03-05 20:40:25 +01:00
Martin Weinelt 1bc7533e28 Merge remote-tracking branch 'origin/master' into staging-next 2023-03-04 19:34:20 +00:00
Martin Weinelt 8ad0eb1ced pgadmin: Use hash and SRI hashes
With the python package set moving to hash, overriding the fetcher and
reintroducing sha256 breaks eval, due to multiple hashes passed.
2023-03-03 23:59:30 +01:00
Florian Brandes 2e719bcde5
pgadmin4: 6.19 -> 6.20
Changelog: https://www.pgadmin.org/docs/pgadmin4/latest/release_notes_6_20.html

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-03-02 13:34:45 +01: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
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
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
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
Florian Brandes eaec638080
pgadmin: fix build
pin flask-sqlalchemy to a version < 3 to work with
the other flask override.

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-01-16 20:13:48 +01:00
Florian Brandes b8e08c014e
pgadmin4: 6.17 -> 6.18
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2022-12-23 11:46:12 +01:00
figsoda ec8cb34358 treewide: fix typos 2022-12-17 19:39:44 -05:00
Thomas Gerbet 87f13e0142 pgamin4: 6.16 -> 6.17
Fixes CVE-2022-4223.

https://www.pgadmin.org/docs/pgadmin4/development/release_notes_6_17.html
2022-12-03 12:19:05 +01:00
Florian Brandes 2d6a645776
pgadmin4: 6.15 -> 6.16
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2022-11-22 06:20:06 +01:00
Florian Brandes e4dfd09d34
pgadmin4: 6.14 -> 6.15
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2022-10-29 17:29:55 +02:00
Sandro Jäckel a11a2a6d18 python310Packages.flask-login: normalise package name 2022-10-17 22:57:53 +02:00
Florian Brandes 2cf3003858 pgadmin4: 6.13 -> 6.14
include fix for flask-security-too update

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2022-10-01 21:56:03 +02:00
Florian Brandes 73f09f2145
pgadmin4: 6.12 -> 6.13
- Add update script
- Add email options to pgadmin4 nixOS module
- Add override for flask 2.2

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2022-09-22 17:42:20 +02:00
Florian Brandes 629b18292c
pgadmin4: 6.11 -> 6.12
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2022-08-06 14:59:09 +02:00
Florian Brandes ecdacf3d46 pgadmin: remove all version constraints
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2022-07-30 19:01:20 +02:00
Martin Weinelt 2298ebf36e python3Packages.flask-sqlalchemy: rename from flask_sqlalchemy 2022-07-21 22:35:28 +02:00
Florian Brandes 3aa303469e pgadmin: 6.10 -> 6.11
skip failing test caused by postgresql update

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2022-07-05 21:26:42 +02:00
Florian Brandes 282eeff244
pgadmin4: 6.9 -> 6.10
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2022-06-06 17:00:01 +02:00
Sandro Jäckel 6b82550333
pgadmin: unpin eventlet dependency, cleanup 2022-06-02 12:20:51 +02:00
Rick van Schijndel 9c7cafc4c4
Merge pull request #173175 from gador/pgadmin-6.9
pgadmin4: 6.8 -> 6.9
2022-05-28 20:49:29 +02:00
Robert Schütz c88d7fb859 python3Packages.flask-wtf: 1.0.0 -> 1.0.1
Also change attribute name from flask_wtf to flask-wtf.
2022-05-24 04:13:39 +00:00
Matthieu Coudron d887e16488 pgadmin: set mainProgram 2022-05-22 18:11:24 +02:00
Florian Brandes d0362198f0 pgadmin4: 6.8 -> 6.9
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2022-05-20 11:53:59 +02:00
Florian Brandes 0c8e4f4f19
pgadmin: minor bugfix in version string
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2022-04-28 17:35:30 +02:00
Florian Brandes 709cc7066b
pgadmin4: pass pythonEnv as variable
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2022-04-28 15:03:31 +02:00
Florian Brandes 0dd6926b29 pgadmin: revert version string
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2022-04-27 19:15:08 +02:00
Florian Brandes eef222b8c2 pgadmin4: fix tests
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 <florian.brandes@posteo.de>
2022-04-27 19:15:08 +02:00
Florian Brandes 5cf8ef4ba4 pgadmin: add werkzeug override
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2022-04-27 19:15:08 +02:00
Frederik Rietdijk cf6b75adb0 pgadmin: fix pgadmin4 command 2022-04-27 19:15:08 +02:00
Florian Brandes fa01814245 pgadmin4: 6.7 -> 6.8
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2022-04-27 19:15:08 +02:00
Martin Weinelt e87755d957 pgadmin4: relax pytz constraint 2022-04-15 03:29:35 +02:00
Timo Kaufmann b44f7ed2c2
Merge pull request #166250 from gador/pgadmin-update-6.7
pgadimin4: 6.5 -> 6.7
2022-04-04 10:07:08 +02:00
Martin Weinelt 9bb92e48ef
pgadmin3: drop
The package version is 6y old and was last maintained in 2017. By now we
have pgadmin4 packaged so there is no reason to keep this around.
2022-03-30 23:44:18 +02:00
Florian Brandes 4c1596384c
pgadimin4: 6.5 -> 6.7
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2022-03-29 15:50:16 +02:00
Maciej Krüger ae2f179c9b
tests/pgadmin4-standalone: add 2022-02-26 14:27:30 +01:00
Maciej Krüger 3cbd5a6deb
pgadmin4: expose setup.py as pgadmin4-setup 2022-02-26 14:27:30 +01:00
florian on nixos (Florian Brandes) 0afa5a1444
pgadmin4: 6.3 -> 6.5
Signed-off-by: florian on nixos (Florian Brandes) <florian.brandes@posteo.de>
2022-02-26 14:08:50 +01:00
florian on nixos (Florian Brandes) 69ec03d112
pgadmin3: move
moved pgadmin3 to pgadmin4 and renamed to 3.nix
added an alias for pgadmin->pgadmin4

Signed-off-by: florian on nixos (Florian Brandes) <florian.brandes@posteo.de>
2022-02-26 13:20:27 +01:00