diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-12-08 22:09:49 +0100 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-12-08 22:09:49 +0100 |
| commit | ad7edda3e2386c8c5e54fd6c91e848f50b237696 (patch) | |
| tree | d90407e11366bd6b155d7ba3cad22ca5557c9835 /nixos/tests | |
| parent | 5f3708016ca0ef547d3fb79a521e9d5bad15d454 (diff) | |
| parent | 366b54b81097701b05276d1b9b63622c558abe17 (diff) | |
| download | nixlib-ad7edda3e2386c8c5e54fd6c91e848f50b237696.tar nixlib-ad7edda3e2386c8c5e54fd6c91e848f50b237696.tar.gz nixlib-ad7edda3e2386c8c5e54fd6c91e848f50b237696.tar.bz2 nixlib-ad7edda3e2386c8c5e54fd6c91e848f50b237696.tar.lz nixlib-ad7edda3e2386c8c5e54fd6c91e848f50b237696.tar.xz nixlib-ad7edda3e2386c8c5e54fd6c91e848f50b237696.tar.zst nixlib-ad7edda3e2386c8c5e54fd6c91e848f50b237696.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/pgjwt.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/postgis.nix | 6 | ||||
| -rw-r--r-- | nixos/tests/promscale.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/timescaledb.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/tsja.nix | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/nixos/tests/pgjwt.nix b/nixos/tests/pgjwt.nix index 4793a3e31503..8d3310b74eb3 100644 --- a/nixos/tests/pgjwt.nix +++ b/nixos/tests/pgjwt.nix @@ -11,7 +11,7 @@ with pkgs; { { services.postgresql = { enable = true; - extraPlugins = [ pgjwt pgtap ]; + extraPlugins = ps: with ps; [ pgjwt pgtap ]; }; }; }; diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix index d0685abc510c..09c738b938ba 100644 --- a/nixos/tests/postgis.nix +++ b/nixos/tests/postgis.nix @@ -9,10 +9,10 @@ import ./make-test-python.nix ({ pkgs, ...} : { { pkgs, ... }: { - services.postgresql = let mypg = pkgs.postgresql; in { + services.postgresql = { enable = true; - package = mypg; - extraPlugins = with mypg.pkgs; [ + package = pkgs.postgresql; + extraPlugins = ps: with ps; [ postgis ]; }; diff --git a/nixos/tests/promscale.nix b/nixos/tests/promscale.nix index d4825b6d7f55..da18628f2482 100644 --- a/nixos/tests/promscale.nix +++ b/nixos/tests/promscale.nix @@ -27,7 +27,7 @@ let services.postgresql = { enable = true; package = postgresql-package; - extraPlugins = with postgresql-package.pkgs; [ + extraPlugins = ps: with ps; [ timescaledb promscale_extension ]; diff --git a/nixos/tests/timescaledb.nix b/nixos/tests/timescaledb.nix index 00a7f9af09fb..ba0a3cec6076 100644 --- a/nixos/tests/timescaledb.nix +++ b/nixos/tests/timescaledb.nix @@ -52,7 +52,7 @@ let services.postgresql = { enable = true; package = postgresql-package; - extraPlugins = with postgresql-package.pkgs; [ + extraPlugins = ps: with ps; [ timescaledb timescaledb_toolkit ]; diff --git a/nixos/tests/tsja.nix b/nixos/tests/tsja.nix index 176783088d8d..f34358ff3f5f 100644 --- a/nixos/tests/tsja.nix +++ b/nixos/tests/tsja.nix @@ -11,7 +11,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { { services.postgresql = { enable = true; - extraPlugins = with config.services.postgresql.package.pkgs; [ + extraPlugins = ps: with ps; [ tsja ]; }; |