Commit Graph

87 Commits

Author SHA1 Message Date
André Vitor de Lima Matos
4a1d5d1e4e
pgadmin4: fix service start issue
systemd service unit currently fails with requiring `pkg_resources` to
be available
2024-11-02 08:19:37 -03:00
Pol Dellaiera
10c5cc0810
pgadmin: 8.11 -> 8.12 (#344227) 2024-09-27 10:35:11 +02:00
Artturin
e0464e4788 treewide: replace stdenv.is with stdenv.hostPlatform.is
In preparation for the deprecation of `stdenv.isX`.

These shorthands are not conducive to cross-compilation because they
hide the platforms.

Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way

One example of why this is bad and especially affects compiler packages
https://www.github.com/NixOS/nixpkgs/pull/343059

There are too many files to go through manually but a treewide should
get users thinking when they see a `hostPlatform.isX` in a place where it
doesn't make sense.

```
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is"
fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is"
```
2024-09-25 00:04:37 +03:00
Florian Brandes
689dcb33e1
pgadmin: 8.11 -> 8.12
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2024-09-24 15:53:37 +02:00
Robert Schütz
a5fa51015c python312Packages.flask-security: rename from flask-security-too
see https://github.com/pallets-eco/flask-security/blob/main/README.rst#notes-on-this-repo
2024-08-26 15:49:41 -07:00
Florian Brandes
1633ace98b
pgadmin: 8.10 -> 8.11
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2024-08-23 10:05:12 +02:00
Florian Brandes
fc8096cd34
pgadmin: format
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2024-07-29 20:30:26 +02:00
Florian Brandes
580e6f79bd
pgadmin: 8.9 -> 8.10
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2024-07-29 20:29:29 +02:00
Florian Brandes
d0fa24085b
pgadmin4: 8.8 -> 8.9
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2024-06-27 21:30:10 +02:00
Florian Brandes
2cae584657
pgadmin4: 8.7 -> 8.8
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2024-06-07 12:52:32 +02:00
Florian Brandes
c9e2a2de8c
pgadmin4: 8.6 -> 8.7
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2024-06-02 19:33:55 +02:00
Florian Brandes
1ad23e2400
pgadmin: 8.5 -> 8.6
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2024-05-08 14:12:21 +02:00
Florian Brandes
ac717dc0ba
pgadmin: disable tests on darwin as of now
see ##198495

tests run fine on non-hydra build machines.

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2024-05-02 12:47:16 +02:00
Sandro Jäckel
fb0d661081
treewide: replace prefetch-yarn-deps with fixup-yarn-lock where necessary 2024-04-17 13:34:05 -04:00
Sandro
ca729afa8c
Merge pull request #302812 from gador/pgadmin-darwin
pgadmin4: add darwin build
2024-04-10 21:54:48 +02:00
Florian Brandes
8d029ac441 pgadmin4: add darwin build
fixexs #281214

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2024-04-09 22:55:10 +02:00
Florian Brandes
62faf6cddf
pgadmin4: fix CSRF issue
Without the downgrade of flask-security-too to 5.4.1
pgadmin4 is unusable, because one cannot login.

Alternatively one could disable CSRF altogether with the
module. This would still make the desktop version unusable
and impact security. Therefore flask-security-too is being
downgraded.

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2024-04-09 15:34:34 +02:00
Florian Brandes
8d2e47b907
pgadmin4: 8.4 -> 8.5
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2024-04-05 12:21:20 +02:00
Florian Brandes
f353e79a82 pgadmin4: 8.3 -> 8.4
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2024-03-14 13:16:02 +01:00
Florian Brandes
53d1bb94a5
pgadmin4: 8.2 -> 8.3
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2024-02-10 17:25:39 +01:00
Florian Brandes
9e7334055a
pgadmin4: remove flask-babelex
babelex has been dropped and can be removed.

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2024-01-26 21:49:10 +01:00
Florian Brandes
1c1ca56266 pgadmin: 8.1 -> 8.2
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2024-01-13 09:54:32 +01:00
Florian Brandes
ae3140f6fd
pgadmin: cleanup
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-12-17 21:33:58 +01:00
Florian Brandes
bf74ecda42 pgadmin: 8.0 -> 8.1
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-12-17 20:52:31 +01:00
Florian Brandes
5beb818e31 pgadmin: 7.8 -> 8.0
Release notes: https://www.pgadmin.org/docs/pgadmin4/latest/release_notes_8_0.html

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-11-23 13:09:01 +01:00
Florian Brandes
918c0666ab pgadmin4: 7.7 -> 7.8
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-11-23 12:29:46 +01:00
Felix Buehler
46c18ddf65 pgadmin: migrate to prefetch-yarn-deps 2023-11-23 12:26:54 +01:00
Florian Brandes
b553f3a109 pgadmin4: fix build due to Flask update
Also updates security-flask-too from 5.3.0 -> 5.3.2
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-10-28 16:41:34 +02:00
Florian Brandes
be90db7f5e pgadmin4: 7.6 -> 7.7
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-10-20 17:05:04 +02:00
Florian Brandes
ba2649dace pgadmin4: 7.5 -> 7.6
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-10-20 17:05:04 +02:00
natsukium
80a2425165
python310Packages.flask-migrate: rename from flask_migrate 2023-08-24 21:46:20 +09:00
natsukium
6733b198a4
python310Packages.flask-mail: rename from flask_mail 2023-08-24 21:46:16 +09:00
Florian Brandes
75d8c49cd6
pgadmin4: 7.4 -> 7.5
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-07-27 18:05:50 +02:00
Florian Brandes
b242d910d0
pgadmin4: 7.3 -> 7.4
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-07-03 13:30:10 +02:00
Florian Brandes
7fa20d1cb4
pgadmin4: 7.2 -> 7.3
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-06-07 19:26:24 +02:00
Florian Brandes
a76b896f6f
pgadmin4: 7.1 -> 7.2
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2023-06-02 15:53:51 +02:00
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