0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00

Merge branch 'master' into staging-next

This commit is contained in:
Weijia Wang 2023-12-08 22:09:49 +01:00
commit ad7edda3e2
44 changed files with 263 additions and 148 deletions

View file

@ -11,7 +11,7 @@ with pkgs; {
{
services.postgresql = {
enable = true;
extraPlugins = [ pgjwt pgtap ];
extraPlugins = ps: with ps; [ pgjwt pgtap ];
};
};
};

View file

@ -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
];
};

View file

@ -27,7 +27,7 @@ let
services.postgresql = {
enable = true;
package = postgresql-package;
extraPlugins = with postgresql-package.pkgs; [
extraPlugins = ps: with ps; [
timescaledb
promscale_extension
];

View file

@ -52,7 +52,7 @@ let
services.postgresql = {
enable = true;
package = postgresql-package;
extraPlugins = with postgresql-package.pkgs; [
extraPlugins = ps: with ps; [
timescaledb
timescaledb_toolkit
];

View file

@ -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
];
};