commit 43dbeae02d74eafc91ad269ebe9363ff5aed1842 · pyrox.dev/nixpkgs

+1 -2

nixos/doc/manual/release-notes/rl-2305.section.md

···

       254
       254
        
         {

     

       255
       255
        
           services.postgresql = {

     

       256
       256
        
             enable = true;

     

       257
       257
       -
             package = pkgs.postgresql_jit;

     

       258
       258
       -
             settings."jit" = "on";

     

       257
       257
       +
             enableJIT = true;

     

       259
       258
        
           };

     

       260
       259
        
         }

     

       261
       260
        
         ```

+37

nixos/modules/services/databases/postgresql.md

···

       171
       171
        
         };

     

       172
       172
        
       }

     

       173
       173
        
       ```

     

       174
       174
       +
       

     

       175
       175
       +
       ## JIT (Just-In-Time compilation) {#module-services-postgres-jit}

     

       176
       176
       +
       

     

       177
       177
       +
       [JIT](https://www.postgresql.org/docs/current/jit-reason.html)-support in the PostgreSQL package

     

       178
       178
       +
       is disabled by default because of the ~300MiB closure-size increase from the LLVM dependency. It

     

       179
       179
       +
       can be optionally enabled in PostgreSQL with the following config option:

     

       180
       180
       +
       

     

       181
       181
       +
       ```nix

     

       182
       182
       +
       {

     

       183
       183
       +
         services.postgresql.enableJIT = true;

     

       184
       184
       +
       }

     

       185
       185
       +
       ```

     

       186
       186
       +
       

     

       187
       187
       +
       This makes sure that the [`jit`](https://www.postgresql.org/docs/current/runtime-config-query.html#GUC-JIT)-setting

     

       188
       188
       +
       is set to `on` and a PostgreSQL package with JIT enabled is used. Further tweaking of the JIT compiler, e.g. setting a different

     

       189
       189
       +
       query cost threshold via [`jit_above_cost`](https://www.postgresql.org/docs/current/runtime-config-query.html#GUC-JIT-ABOVE-COST)

     

       190
       190
       +
       can be done manually via [`services.postgresql.settings`](#opt-services.postgresql.settings).

     

       191
       191
       +
       

     

       192
       192
       +
       The attribute-names of JIT-enabled PostgreSQL packages are suffixed with `_jit`, i.e. for each `pkgs.postgresql`

     

       193
       193
       +
       (and `pkgs.postgresql_<major>`) in `nixpkgs` there's also a `pkgs.postgresql_jit` (and `pkgs.postgresql_<major>_jit`).

     

       194
       194
       +
       Alternatively, a JIT-enabled variant can be derived from a given `postgresql` package via `postgresql.withJIT`.

     

       195
       195
       +
       This is also useful if it's not clear which attribute from `nixpkgs` was originally used (e.g. when working with

     

       196
       196
       +
       [`config.services.postgresql.package`](#opt-services.postgresql.package) or if the package was modified via an

     

       197
       197
       +
       overlay) since all modifications are propagated to `withJIT`. I.e.

     

       198
       198
       +
       

     

       199
       199
       +
       ```nix

     

       200
       200
       +
       with import <nixpkgs> {

     

       201
       201
       +
         overlays = [

     

       202
       202
       +
           (self: super: {

     

       203
       203
       +
             postgresql = super.postgresql.overrideAttrs (_: { pname = "foobar"; });

     

       204
       204
       +
           })

     

       205
       205
       +
         ];

     

       206
       206
       +
       };

     

       207
       207
       +
       postgresql.withJIT.pname

     

       208
       208
       +
       ```

     

       209
       209
       +
       

     

       210
       210
       +
       evaluates to `"foobar"`.

+9 -5

nixos/modules/services/databases/postgresql.nix

···

       42
       42
        
       

     

       43
       43
        
             enable = mkEnableOption (lib.mdDoc "PostgreSQL Server");

     

       44
       44
        
       

     

       45
       45
       +
             enableJIT = mkEnableOption (lib.mdDoc "JIT support");

     

       46
       46
       +
       

     

       45
       47
        
             package = mkOption {

     

       46
       48
        
               type = types.package;

     

       47
       49
        
               example = literalExpression "pkgs.postgresql_11";

     
···

       435
       437
        
               log_line_prefix = cfg.logLinePrefix;

     

       436
       438
        
               listen_addresses = if cfg.enableTCPIP then "*" else "localhost";

     

       437
       439
        
               port = cfg.port;

     

       440
       440
       +
               jit = mkDefault (if cfg.enableJIT then "on" else "off");

     

       438
       441
        
             };

     

       439
       442
        
       

     

       440
       443
        
           services.postgresql.package = let

     

       441
       444
        
               mkThrow = ver: throw "postgresql_${ver} was removed, please upgrade your postgresql version.";

     

       445
       445
       +
               base = if versionAtLeast config.system.stateVersion "22.05" then pkgs.postgresql_14

     

       446
       446
       +
                   else if versionAtLeast config.system.stateVersion "21.11" then pkgs.postgresql_13

     

       447
       447
       +
                   else if versionAtLeast config.system.stateVersion "20.03" then pkgs.postgresql_11

     

       448
       448
       +
                   else if versionAtLeast config.system.stateVersion "17.09" then mkThrow "9_6"

     

       449
       449
       +
                   else mkThrow "9_5";

     

       442
       450
        
           in

     

       443
       451
        
             # Note: when changing the default, make it conditional on

     

       444
       452
        
             # ‘system.stateVersion’ to maintain compatibility with existing

     

       445
       453
        
             # systems!

     

       446
       446
       -
             mkDefault (if versionAtLeast config.system.stateVersion "22.05" then pkgs.postgresql_14

     

       447
       447
       -
                   else if versionAtLeast config.system.stateVersion "21.11" then pkgs.postgresql_13

     

       448
       448
       -
                   else if versionAtLeast config.system.stateVersion "20.03" then pkgs.postgresql_11

     

       449
       449
       -
                   else if versionAtLeast config.system.stateVersion "17.09" then mkThrow "9_6"

     

       450
       450
       -
                   else mkThrow "9_5");

     

       454
       454
       +
             mkDefault (if cfg.enableJIT then base.withJIT else base);

     

       451
       455
        
       

     

       452
       456
        
           services.postgresql.dataDir = mkDefault "/var/lib/postgresql/${cfg.package.psqlSchema}";

     

       453
       457

+10 -1

pkgs/servers/sql/postgresql/default.nix

···

       197
       197
        
       

     

       198
       198
        
           disallowedReferences = [ stdenv'.cc ];

     

       199
       199
        
       

     

       200
       200
       -
           passthru = {

     

       200
       200
       +
           passthru = let

     

       201
       201
       +
             jitToggle = this.override {

     

       202
       202
       +
               jitSupport = !jitSupport;

     

       203
       203
       +
               this = jitToggle;

     

       204
       204
       +
             };

     

       205
       205
       +
           in

     

       206
       206
       +
           {

     

       201
       207
        
             inherit readline psqlSchema jitSupport;

     

       208
       208
       +
       

     

       209
       209
       +
             withJIT = if jitSupport then this else jitToggle;

     

       210
       210
       +
             withoutJIT = if jitSupport then jitToggle else this;

     

       202
       211
        
       

     

       203
       212
        
             pkgs = let

     

       204
       213
        
               scope = {