commit dd5fd6cc225c912f73bf38b338507cfa72daa1c8 · pyrox.dev/nixpkgs

-1

nixos/tests/postgresql/anonymizer.nix

···

       20
       20
        
                 services.postgresql = {

     

       21
       21
        
                   inherit package;

     

       22
       22
        
                   enable = true;

     

       23
       23
       -
                   enableJIT = lib.hasInfix "-jit-" package.name;

     

       24
       23
        
                   extensions = ps: [ ps.anonymizer ];

     

       25
       24
        
                   settings.shared_preload_libraries = [ "anon" ];

     

       26
       25
        
                 };

-1

nixos/tests/postgresql/citus.nix

···

       35
       35
        
                 services.postgresql = {

     

       36
       36
        
                   inherit package;

     

       37
       37
        
                   enable = true;

     

       38
       38
       -
                   enableJIT = lib.hasInfix "-jit-" package.name;

     

       39
       38
        
                   extensions =

     

       40
       39
        
                     ps: with ps; [

     

       41
       40
        
                       citus

-1

nixos/tests/postgresql/pgjwt.nix

···

       24
       24
        
                 services.postgresql = {

     

       25
       25
        
                   inherit package;

     

       26
       26
        
                   enable = true;

     

       27
       27
       -
                   enableJIT = lib.hasInfix "-jit-" package.name;

     

       28
       27
        
                   extensions =

     

       29
       28
        
                     ps: with ps; [

     

       30
       29
        
                       pgjwt

-1

nixos/tests/postgresql/pgvecto-rs.nix

···

       38
       38
        
                 services.postgresql = {

     

       39
       39
        
                   inherit package;

     

       40
       40
        
                   enable = true;

     

       41
       41
       -
                   enableJIT = lib.hasInfix "-jit-" package.name;

     

       42
       41
        
                   extensions =

     

       43
       42
        
                     ps: with ps; [

     

       44
       43
        
                       pgvecto-rs

-1

nixos/tests/postgresql/postgresql-jit.nix

···

       51
       51
        
       in

     

       52
       52
        
       genTests {

     

       53
       53
        
         inherit makeTestFor;

     

       54
       54
       -
         filter = n: _: lib.hasSuffix "_jit" n;

     

       55
       54
        
       }

-1

nixos/tests/postgresql/postgresql-tls-client-cert.nix

···

       51
       51
        
                 services.postgresql = {

     

       52
       52
        
                   inherit package;

     

       53
       53
        
                   enable = true;

     

       54
       54
       -
                   enableJIT = lib.hasInfix "-jit-" package.name;

     

       55
       54
        
                   enableTCPIP = true;

     

       56
       55
        
                   ensureUsers = [

     

       57
       56
        
                     {

-1

nixos/tests/postgresql/postgresql-wal-receiver.nix

···

       32
       32
        
                 services.postgresql = {

     

       33
       33
        
                   inherit package;

     

       34
       34
        
                   enable = true;

     

       35
       35
       -
                   enableJIT = lib.hasInfix "-jit-" package.name;

     

       36
       35
        
                   settings = {

     

       37
       36
        
                     max_replication_slots = 10;

     

       38
       37
        
                     max_wal_senders = 10;

-1

nixos/tests/postgresql/postgresql.nix

···

       54
       54
        
                 services.postgresql = {

     

       55
       55
        
                   inherit package;

     

       56
       56
        
                   enable = true;

     

       57
       57
       -
                   enableJIT = lib.hasInfix "-jit-" package.name;

     

       58
       57
        
                   # TODO(@Ma27) split this off into its own VM test and move a few other

     

       59
       58
        
                   # extension tests to use postgresqlTestExtension.

     

       60
       59
        
                   extensions = ps: with ps; [ plv8 ];

-1

nixos/tests/postgresql/timescaledb.nix

···

       54
       54
        
                 services.postgresql = {

     

       55
       55
        
                   inherit package;

     

       56
       56
        
                   enable = true;

     

       57
       57
       -
                   enableJIT = lib.hasInfix "-jit-" package.name;

     

       58
       57
        
                   extensions =

     

       59
       58
        
                     ps: with ps; [

     

       60
       59
        
                       timescaledb

-1

nixos/tests/postgresql/tsja.nix

···

       21
       21
        
                 services.postgresql = {

     

       22
       22
        
                   inherit package;

     

       23
       23
        
                   enable = true;

     

       24
       24
       -
                   enableJIT = lib.hasInfix "-jit-" package.name;

     

       25
       24
        
                   extensions =

     

       26
       25
        
                     ps: with ps; [

     

       27
       26
        
                       tsja

-1

nixos/tests/postgresql/wal2json.nix

···

       17
       17
        
               services.postgresql = {

     

       18
       18
        
                 inherit package;

     

       19
       19
        
                 enable = true;

     

       20
       20
       -
                 enableJIT = lib.hasInfix "-jit-" package.name;

     

       21
       20
        
                 extensions = with package.pkgs; [ wal2json ];

     

       22
       21
        
                 settings = {

     

       23
       22
        
                   wal_level = "logical";

+2 -2

pkgs/by-name/pg/pg_checksums/package.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
       -
         stdenv,

     

       3
       3
       +
         clangStdenv,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
        
         libxslt,

     

       6
       6
        
         docbook_xsl,

     

       7
       7
        
         postgresql,

     

       8
       8
        
       }:

     

       9
       9
        
       

     

       10
       10
       -
       stdenv.mkDerivation rec {

     

       10
       10
       +
       clangStdenv.mkDerivation rec {

     

       11
       11
        
         pname = "pg_checksums";

     

       12
       12
        
         version = "1.2";

     

       13
       13

+3 -3

pkgs/by-name/pg/pgcopydb/package.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
       -
         stdenv,

     

       3
       3
       +
         clangStdenv,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
        
         libkrb5,

     

       6
       6
        
         openssl,

     
···

       13
       13
        
         zlib,

     

       14
       14
        
       }:

     

       15
       15
        
       

     

       16
       16
       -
       stdenv.mkDerivation (finalAttrs: {

     

       16
       16
       +
       clangStdenv.mkDerivation (finalAttrs: {

     

       17
       17
        
         pname = "pgcopydb";

     

       18
       18
        
         version = "0.15";

     

       19
       19
        
       

     
···

       38
       38
        
             sqlite

     

       39
       39
        
             zlib

     

       40
       40
        
           ]

     

       41
       41
       -
           ++ lib.optionals stdenv.hostPlatform.isLinux [

     

       41
       41
       +
           ++ lib.optionals clangStdenv.hostPlatform.isLinux [

     

       42
       42
        
             pam

     

       43
       43
        
           ];

     

       44
       44

+5 -6

pkgs/servers/sql/postgresql/default.nix

···

       22
       22
        
             version: path:

     

       23
       23
        
             let

     

       24
       24
        
               attrName = if jitSupport then "${version}_jit" else version;

     

       25
       25
       +
               postgresql = import path { inherit self; };

     

       26
       26
       +
               attrValue = if jitSupport then postgresql.withJIT else postgresql.withoutJIT;

     

       25
       27
        
             in

     

       26
       26
       -
             self.lib.nameValuePair attrName (

     

       27
       27
       -
               import path {

     

       28
       28
       -
                 inherit jitSupport self;

     

       29
       29
       -
               }

     

       30
       30
       -
             )

     

       28
       28
       +
             self.lib.nameValuePair attrName attrValue

     

       31
       29
        
           ) versions;

     

       32
       30
        
       

     

       33
       31
        
         libpq = self.callPackage ./libpq.nix { };

     
···

       35
       33
        
       in

     

       36
       34
        
       {

     

       37
       35
        
         # variations without and with JIT

     

       38
       38
       -
         postgresqlVersions = mkAttributes false // mkAttributes true;

     

       36
       36
       +
         postgresqlVersions = mkAttributes false;

     

       37
       37
       +
         postgresqlJitVersions = mkAttributes true;

     

       39
       38
        
       

     

       40
       39
        
         inherit libpq;

     

       41
       40
        
       }

+112 -64

pkgs/servers/sql/postgresql/generic.nix

···

       66
       66
        
             icu,

     

       67
       67
        
       

     

       68
       68
        
             # JIT

     

       69
       69
       -
             jitSupport, # not default on purpose, this is set via "_jit or not" attributes

     

       69
       69
       +
             jitSupport ?

     

       70
       70
       +
               stdenv.hostPlatform.canExecute stdenv.buildPlatform

     

       71
       71
       +
               # Building with JIT in pkgsStatic fails like this:

     

       72
       72
       +
               #   fatal error: 'stdio.h' file not found

     

       73
       73
       +
               && !stdenv.hostPlatform.isStatic,

     

       70
       74
        
             llvmPackages,

     

       71
       75
        
             nukeReferences,

     

       72
       76
        
             overrideCC,

     
···

       135
       139
        
       

     

       136
       140
        
             dlSuffix = if olderThan "16" then ".so" else stdenv.hostPlatform.extensions.sharedLibrary;

     

       137
       141
        
       

     

       138
       138
       -
             pname = "postgresql";

     

       139
       139
       -
       

     

       140
       142
        
             stdenv' =

     

       141
       141
       -
               if jitSupport && !stdenv.cc.isClang then

     

       143
       143
       +
               if !stdenv.cc.isClang then

     

       142
       144
        
                 overrideCC llvmPackages.stdenv (

     

       143
       145
        
                   llvmPackages.stdenv.cc.override {

     

       144
       146
        
                     # LLVM bintools are not used by default, but are needed to make -flto work below.

     
···

       150
       152
        
           in

     

       151
       153
        
           stdenv'.mkDerivation (finalAttrs: {

     

       152
       154
        
             inherit version;

     

       153
       153
       -
             pname = pname + lib.optionalString jitSupport "-jit";

     

       155
       155
       +
             pname = "postgresql";

     

       154
       156
        
       

     

       155
       157
        
             src = fetchFromGitHub {

     

       156
       158
        
               owner = "postgres";

     
···

       161
       163
        
             };

     

       162
       164
        
       

     

       163
       165
        
             __structuredAttrs = true;

     

       164
       164
       -
       

     

       165
       165
       -
             hardeningEnable = lib.optionals (!stdenv'.cc.isClang) [ "pie" ];

     

       166
       166
        
       

     

       167
       167
        
             outputs =

     

       168
       168
        
               [

     
···

       172
       172
        
                 "lib"

     

       173
       173
        
                 "man"

     

       174
       174
        
               ]

     

       175
       175
       +
               ++ lib.optionals jitSupport [ "jit" ]

     

       175
       176
        
               ++ lib.optionals perlSupport [ "plperl" ]

     

       176
       177
        
               ++ lib.optionals pythonSupport [ "plpython3" ]

     

       177
       178
        
               ++ lib.optionals tclSupport [ "pltcl" ];

     

       178
       178
       -
             outputChecks = {

     

       179
       179
       -
               out = {

     

       180
       180
       -
                 disallowedReferences = [

     

       181
       181
       -
                   "dev"

     

       182
       182
       -
                   "doc"

     

       183
       183
       -
                   "man"

     

       184
       184
       -
                 ];

     

       185
       185
       -
                 disallowedRequisites = [

     

       186
       186
       -
                   stdenv'.cc

     

       187
       187
       -
                   llvmPackages.llvm.out

     

       188
       188
       -
                 ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs));

     

       189
       189
       -
               };

     

       190
       179
        
       

     

       191
       191
       -
               lib = {

     

       192
       192
       -
                 disallowedReferences = [

     

       193
       193
       -
                   "out"

     

       194
       194
       -
                   "dev"

     

       195
       195
       -
                   "doc"

     

       196
       196
       -
                   "man"

     

       197
       197
       -
                 ];

     

       198
       198
       -
                 disallowedRequisites = [

     

       199
       199
       -
                   stdenv'.cc

     

       200
       200
       -
                   llvmPackages.llvm.out

     

       201
       201
       -
                 ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs));

     

       202
       202
       -
               };

     

       180
       180
       +
             outputChecks =

     

       181
       181
       +
               {

     

       182
       182
       +
                 out = {

     

       183
       183
       +
                   disallowedReferences = [

     

       184
       184
       +
                     "dev"

     

       185
       185
       +
                     "doc"

     

       186
       186
       +
                     "man"

     

       187
       187
       +
                   ] ++ lib.optionals jitSupport [ "jit" ];

     

       188
       188
       +
                   disallowedRequisites = [

     

       189
       189
       +
                     stdenv'.cc

     

       190
       190
       +
                     llvmPackages.llvm.out

     

       191
       191
       +
                   ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs));

     

       192
       192
       +
                 };

     

       203
       193
        
       

     

       204
       204
       -
               doc = {

     

       205
       205
       -
                 disallowedReferences = [

     

       206
       206
       -
                   "out"

     

       207
       207
       -
                   "dev"

     

       208
       208
       -
                   "man"

     

       209
       209
       -
                 ];

     

       210
       210
       -
               };

     

       194
       194
       +
                 lib = {

     

       195
       195
       +
                   disallowedReferences = [

     

       196
       196
       +
                     "out"

     

       197
       197
       +
                     "dev"

     

       198
       198
       +
                     "doc"

     

       199
       199
       +
                     "man"

     

       200
       200
       +
                   ] ++ lib.optionals jitSupport [ "jit" ];

     

       201
       201
       +
                   disallowedRequisites = [

     

       202
       202
       +
                     stdenv'.cc

     

       203
       203
       +
                     llvmPackages.llvm.out

     

       204
       204
       +
                   ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs));

     

       205
       205
       +
                 };

     

       211
       206
        
       

     

       212
       212
       -
               man = {

     

       213
       213
       -
                 disallowedReferences = [

     

       214
       214
       -
                   "out"

     

       215
       215
       -
                   "dev"

     

       216
       216
       -
                   "doc"

     

       217
       217
       -
                 ];

     

       207
       207
       +
                 doc = {

     

       208
       208
       +
                   disallowedReferences = [

     

       209
       209
       +
                     "out"

     

       210
       210
       +
                     "dev"

     

       211
       211
       +
                     "man"

     

       212
       212
       +
                   ] ++ lib.optionals jitSupport [ "jit" ];

     

       213
       213
       +
                 };

     

       214
       214
       +
       

     

       215
       215
       +
                 man = {

     

       216
       216
       +
                   disallowedReferences = [

     

       217
       217
       +
                     "out"

     

       218
       218
       +
                     "dev"

     

       219
       219
       +
                     "doc"

     

       220
       220
       +
                   ] ++ lib.optionals jitSupport [ "jit" ];

     

       221
       221
       +
                 };

     

       222
       222
       +
               }

     

       223
       223
       +
               // lib.optionalAttrs jitSupport {

     

       224
       224
       +
                 jit = {

     

       225
       225
       +
                   disallowedReferences = [

     

       226
       226
       +
                     "dev"

     

       227
       227
       +
                     "doc"

     

       228
       228
       +
                     "man"

     

       229
       229
       +
                   ];

     

       230
       230
       +
                   disallowedRequisites = [

     

       231
       231
       +
                     stdenv'.cc

     

       232
       232
       +
                     llvmPackages.llvm.out

     

       233
       233
       +
                   ] ++ (map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs));

     

       234
       234
       +
                 };

     

       218
       235
        
               };

     

       219
       219
       -
             };

     

       220
       236
        
       

     

       221
       237
        
             strictDeps = true;

     

       222
       238
        
       

     
···

       271
       287
        
                 # flags will remove unused sections from all shared libraries and binaries - including

     

       272
       288
        
                 # those paths. This avoids a lot of circular dependency problems with different outputs,

     

       273
       289
        
                 # and allows splitting them cleanly.

     

       274
       274
       -
                 CFLAGS =

     

       275
       275
       -
                   "-fdata-sections -ffunction-sections"

     

       276
       276
       -
                   + (if stdenv'.cc.isClang then " -flto" else " -fmerge-constants -Wl,--gc-sections");

     

       290
       290
       +
                 CFLAGS = "-fdata-sections -ffunction-sections -flto";

     

       277
       291
        
               }

     

       278
       292
        
               // lib.optionalAttrs perlSupport { PERL = lib.getExe perl; }

     

       279
       293
        
               // lib.optionalAttrs pythonSupport { PYTHON = lib.getExe python3; }

     
···

       364
       378
        
       

     

       365
       379
        
             installTargets = [ "install-world" ];

     

       366
       380
        
       

     

       367
       367
       -
             postPatch = ''

     

       368
       368
       -
               substituteInPlace "src/Makefile.global.in" --subst-var out

     

       369
       369
       -
               substituteInPlace "src/common/config_info.c" --subst-var dev

     

       370
       370
       -
               cat ${./pg_config.env.mk} >> src/common/Makefile

     

       371
       371
       -
             '';

     

       381
       381
       +
             postPatch =

     

       382
       382
       +
               ''

     

       383
       383
       +
                 substituteInPlace "src/Makefile.global.in" --subst-var out

     

       384
       384
       +
                 substituteInPlace "src/common/config_info.c" --subst-var dev

     

       385
       385
       +
                 cat ${./pg_config.env.mk} >> src/common/Makefile

     

       386
       386
       +
               ''

     

       387
       387
       +
               # This check was introduced upstream to prevent calls to "exit" inside libpq.

     

       388
       388
       +
               # However, this doesn't work reliably with static linking, see this and following:

     

       389
       389
       +
               # https://postgr.es/m/flat/20210703001639.GB2374652%40rfd.leadboat.com#52584ca4bd3cb9dac376f3158c419f97

     

       390
       390
       +
               # Thus, disable the check entirely, as it would currently fail with this:

     

       391
       391
       +
               # > libpq.so.5.17:                  U atexit

     

       392
       392
       +
               # > libpq.so.5.17:                  U pthread_exit

     

       393
       393
       +
               # > libpq must not be calling any function which invokes exit

     

       394
       394
       +
               # Don't mind the fact that this checks libpq.**so** in pkgsStatic - that's correct, since PostgreSQL

     

       395
       395
       +
               # still needs a shared library internally.

     

       396
       396
       +
               + lib.optionalString (atLeast "15" && stdenv'.hostPlatform.isStatic) ''

     

       397
       397
       +
                 substituteInPlace src/interfaces/libpq/Makefile \

     

       398
       398
       +
                   --replace-fail "echo 'libpq must not be calling any function which invokes exit'; exit 1;" "echo;"

     

       399
       399
       +
               '';

     

       372
       400
        
       

     

       373
       401
        
             postInstall =

     

       374
       402
        
               ''

     
···

       415
       443
        
       

     

       416
       444
        
                 # Stop lib depending on the -dev output of llvm

     

       417
       445
        
                 remove-references-to -t ${llvmPackages.llvm.dev} "$out/lib/llvmjit${dlSuffix}"

     

       446
       446
       +
       

     

       447
       447
       +
                 moveToOutput "lib/bitcode" "$jit"

     

       448
       448
       +
                 moveToOutput "lib/llvmjit*" "$jit"

     

       418
       449
        
               ''

     

       419
       450
        
               + lib.optionalString stdenv'.hostPlatform.isDarwin ''

     

       420
       451
        
                 # The darwin specific Makefile for PGXS contains a reference to the postgres

     
···

       466
       497
        
             passthru =

     

       467
       498
        
               let

     

       468
       499
        
                 this = self.callPackage generic args;

     

       469
       469
       -
                 jitToggle = this.override {

     

       470
       470
       -
                   jitSupport = !jitSupport;

     

       471
       471
       -
                 };

     

       472
       500
        
               in

     

       473
       501
        
               {

     

       474
       502
        
                 inherit dlSuffix;

     

       475
       503
        
       

     

       476
       504
        
                 psqlSchema = lib.versions.major version;

     

       477
       505
        
       

     

       478
       478
       -
                 withJIT = if jitSupport then this else jitToggle;

     

       479
       479
       -
                 withoutJIT = if jitSupport then jitToggle else this;

     

       506
       506
       +
                 withJIT = this.withPackages (_: [ this.jit ]);

     

       507
       507
       +
                 withoutJIT = this;

     

       480
       508
        
       

     

       481
       509
        
                 pkgs =

     

       482
       510
        
                   let

     
···

       586
       614
        
               inherit installedExtensions;

     

       587
       615
        
               inherit (postgresql)

     

       588
       616
        
                 pg_config

     

       617
       617
       +
                 pkgs

     

       589
       618
        
                 psqlSchema

     

       590
       619
        
                 version

     

       591
       620
        
                 ;

     

       592
       621
        
       

     

       593
       622
        
               withJIT = postgresqlWithPackages {

     

       594
       594
       -
                 inherit buildEnv lib makeBinaryWrapper;

     

       595
       595
       -
                 postgresql = postgresql.withJIT;

     

       596
       596
       -
               } f;

     

       623
       623
       +
                 inherit

     

       624
       624
       +
                   buildEnv

     

       625
       625
       +
                   lib

     

       626
       626
       +
                   makeBinaryWrapper

     

       627
       627
       +
                   postgresql

     

       628
       628
       +
                   ;

     

       629
       629
       +
               } (_: installedExtensions ++ [ postgresql.jit ]);

     

       597
       630
        
               withoutJIT = postgresqlWithPackages {

     

       598
       598
       -
                 inherit buildEnv lib makeBinaryWrapper;

     

       599
       599
       -
                 postgresql = postgresql.withoutJIT;

     

       600
       600
       -
               } f;

     

       631
       631
       +
                 inherit

     

       632
       632
       +
                   buildEnv

     

       633
       633
       +
                   lib

     

       634
       634
       +
                   makeBinaryWrapper

     

       635
       635
       +
                   postgresql

     

       636
       636
       +
                   ;

     

       637
       637
       +
               } (_: lib.remove postgresql.jit installedExtensions);

     

       638
       638
       +
       

     

       639
       639
       +
               withPackages =

     

       640
       640
       +
                 f':

     

       641
       641
       +
                 postgresqlWithPackages {

     

       642
       642
       +
                   inherit

     

       643
       643
       +
                     buildEnv

     

       644
       644
       +
                     lib

     

       645
       645
       +
                     makeBinaryWrapper

     

       646
       646
       +
                     postgresql

     

       647
       647
       +
                     ;

     

       648
       648
       +
                 } (ps: installedExtensions ++ f' ps);

     

       601
       649
        
             };

     

       602
       650
        
           };

     

       603
       651

+3

pkgs/top-level/all-packages.nix

···

       12455
       12455
        
       

     

       12456
       12456
        
         inherit (import ../servers/sql/postgresql pkgs)

     

       12457
       12457
        
           postgresqlVersions

     

       12458
       12458
       +
           postgresqlJitVersions

     

       12458
       12459
        
           libpq

     

       12459
       12460
        
           ;

     

       12460
       12461
        
       

     
···

       12464
       12465
        
           postgresql_15

     

       12465
       12466
        
           postgresql_16

     

       12466
       12467
        
           postgresql_17

     

       12468
       12468
       +
           ;

     

       12467
       12469
        
       

     

       12470
       12470
       +
         inherit (postgresqlJitVersions)

     

       12468
       12471
        
           postgresql_13_jit

     

       12469
       12472
        
           postgresql_14_jit

     

       12470
       12473
        
           postgresql_15_jit