diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2024-03-17 10:00:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-17 10:00:07 +0000 |
| commit | 6af7e814afb3b62171eee1edc31989ee61528d25 (patch) | |
| tree | df5936632b46ee9cba9c58f5ac727c87796dff7e /nixos/modules | |
| parent | d240fbc9f6376823ae5d1d70b8f4b52fc5dbd876 (diff) | |
| parent | 01444957bad77f93aca788fdbd2eca8e4c4da97e (diff) | |
| download | nixlib-6af7e814afb3b62171eee1edc31989ee61528d25.tar nixlib-6af7e814afb3b62171eee1edc31989ee61528d25.tar.gz nixlib-6af7e814afb3b62171eee1edc31989ee61528d25.tar.bz2 nixlib-6af7e814afb3b62171eee1edc31989ee61528d25.tar.lz nixlib-6af7e814afb3b62171eee1edc31989ee61528d25.tar.xz nixlib-6af7e814afb3b62171eee1edc31989ee61528d25.tar.zst nixlib-6af7e814afb3b62171eee1edc31989ee61528d25.zip | |
Merge pull request #292993 from wolfgangwalther/postgresql-refactor
postgresql: refactor and cleanup
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/databases/postgresql.md | 2 | ||||
| -rw-r--r-- | nixos/modules/services/databases/postgresql.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md index 7d141f12b5de..3ff1f00fa9cf 100644 --- a/nixos/modules/services/databases/postgresql.md +++ b/nixos/modules/services/databases/postgresql.md @@ -277,7 +277,7 @@ self: super: { Here's a recipe on how to override a particular plugin through an overlay: ``` self: super: { - postgresql_15 = super.postgresql_15.override { this = self.postgresql_15; } // { + postgresql_15 = super.postgresql_15// { pkgs = super.postgresql_15.pkgs // { pg_repack = super.postgresql_15.pkgs.pg_repack.overrideAttrs (_: { name = "pg_repack-v20181024"; diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index c4e76c82ba5c..c3f3b98ae5e7 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -14,7 +14,7 @@ let # package = pkgs.postgresql_<major>; # }; # works. - base = if cfg.enableJIT && !cfg.package.jitSupport then cfg.package.withJIT else cfg.package; + base = if cfg.enableJIT then cfg.package.withJIT else cfg.package; in if cfg.extraPlugins == [] then base |