commit f8bc00efc5671bd6084f88f995d6928956e6b85f · pyrox.dev/nixpkgs

+71 -70

pkgs/servers/sql/postgresql/generic.nix

···

       456
       456
        
               "$out/bin/pg_config" > "$dev/nix-support/pg_config.expected"

     

       457
       457
        
             ''

     

       458
       458
        
             + ''

     

       459
       459
       -
               rm "$out/bin/pg_config"

     

       460
       460
       -
               make -C src/common pg_config.env

     

       461
       461
       -
               install -D src/common/pg_config.env "$dev/nix-support/pg_config.env"

     

       459
       459
       +
                 rm "$out/bin/pg_config"

     

       460
       460
       +
                 make -C src/common pg_config.env

     

       461
       461
       +
                 substituteInPlace src/common/pg_config.env \

     

       462
       462
       +
                   --replace-fail "$out" "@out@" \

     

       463
       463
       +
                   --replace-fail "$man" "@man@"

     

       464
       464
       +
                 install -D src/common/pg_config.env "$dev/nix-support/pg_config.env"

     

       462
       465
        
       

     

       463
       466
        
               # postgres exposes external symbols get_pkginclude_path and similar. Those

     

       464
       467
        
               # can't be stripped away by --gc-sections/LTO, because they could theoretically

     
···

       585
       588
        
                   postgresql = this;

     

       586
       589
        
                 };

     

       587
       590
        
       

     

       588
       588
       -
                 pg_config = buildPackages.callPackage ./pg_config.nix { inherit (finalAttrs) finalPackage; };

     

       591
       591
       +
                 pg_config = buildPackages.callPackage ./pg_config.nix {

     

       592
       592
       +
                   inherit (finalAttrs) finalPackage;

     

       593
       593
       +
                   outputs = {

     

       594
       594
       +
                     out = lib.getOutput "out" finalAttrs.finalPackage;

     

       595
       595
       +
                     man = lib.getOutput "man" finalAttrs.finalPackage;

     

       596
       596
       +
                   };

     

       597
       597
       +
                 };

     

       589
       598
        
       

     

       590
       599
        
                 tests = {

     

       591
       600
        
                   postgresql = nixosTests.postgresql.postgresql.passthru.override finalAttrs.finalPackage;

     
···

       639
       648
        
           f:

     

       640
       649
        
           let

     

       641
       650
        
             installedExtensions = f postgresql.pkgs;

     

       642
       642
       -
             finalPackage =

     

       643
       643
       -
               (buildEnv {

     

       644
       644
       -
                 name = "${postgresql.pname}-and-plugins-${postgresql.version}";

     

       645
       645
       -
                 paths = installedExtensions ++ [

     

       646
       646
       -
                   # consider keeping in-sync with `postBuild` below

     

       647
       647
       -
                   postgresql

     

       648
       648
       -
                   postgresql.man # in case user installs this into environment

     

       649
       649
       -
                 ];

     

       651
       651
       +
             finalPackage = buildEnv {

     

       652
       652
       +
               name = "${postgresql.pname}-and-plugins-${postgresql.version}";

     

       653
       653
       +
               paths = installedExtensions ++ [

     

       654
       654
       +
                 # consider keeping in-sync with `postBuild` below

     

       655
       655
       +
                 postgresql

     

       656
       656
       +
                 postgresql.man # in case user installs this into environment

     

       657
       657
       +
               ];

     

       650
       658
        
       

     

       651
       651
       -
                 pathsToLink = [

     

       652
       652
       -
                   "/"

     

       653
       653
       -
                   "/bin"

     

       654
       654
       -
                   "/share/postgresql/extension"

     

       655
       655
       -
                   # Unbreaks Omnigres' build system

     

       656
       656
       -
                   "/share/postgresql/timezonesets"

     

       657
       657
       -
                   "/share/postgresql/tsearch_data"

     

       658
       658
       -
                 ];

     

       659
       659
       +
               pathsToLink = [

     

       660
       660
       +
                 "/"

     

       661
       661
       +
                 "/bin"

     

       662
       662
       +
                 "/share/postgresql/extension"

     

       663
       663
       +
                 # Unbreaks Omnigres' build system

     

       664
       664
       +
                 "/share/postgresql/timezonesets"

     

       665
       665
       +
                 "/share/postgresql/tsearch_data"

     

       666
       666
       +
               ];

     

       659
       667
        
       

     

       660
       660
       -
                 nativeBuildInputs = [ makeBinaryWrapper ];

     

       661
       661
       -
                 postBuild =

     

       662
       662
       -
                   let

     

       663
       663
       -
                     args = lib.concatMap (ext: ext.wrapperArgs or [ ]) installedExtensions;

     

       664
       664
       -
                   in

     

       665
       665
       -
                   ''

     

       666
       666
       -
                     wrapProgram "$out/bin/postgres" ${lib.concatStringsSep " " args}

     

       668
       668
       +
               nativeBuildInputs = [ makeBinaryWrapper ];

     

       669
       669
       +
               postBuild =

     

       670
       670
       +
                 let

     

       671
       671
       +
                   args = lib.concatMap (ext: ext.wrapperArgs or [ ]) installedExtensions;

     

       672
       672
       +
                 in

     

       673
       673
       +
                 ''

     

       674
       674
       +
                   wrapProgram "$out/bin/postgres" ${lib.concatStringsSep " " args}

     

       675
       675
       +
                 '';

     

       676
       676
       +
       

     

       677
       677
       +
               passthru = {

     

       678
       678
       +
                 inherit installedExtensions;

     

       679
       679
       +
                 inherit (postgresql)

     

       680
       680
       +
                   pkgs

     

       681
       681
       +
                   psqlSchema

     

       682
       682
       +
                   version

     

       683
       683
       +
                   ;

     

       667
       684
        
       

     

       668
       668
       -
                     mkdir -p "$dev/nix-support"

     

       669
       669
       -
                     substitute "${lib.getDev postgresql}/nix-support/pg_config.env" "$dev/nix-support/pg_config.env" \

     

       670
       670
       -
                       --replace-fail "${postgresql}" "$out" \

     

       671
       671
       -
                       --replace-fail "${postgresql.man}" "$out"

     

       672
       672
       -
                   '';

     

       685
       685
       +
                 pg_config = postgresql.pg_config.override {

     

       686
       686
       +
                   outputs = {

     

       687
       687
       +
                     out = finalPackage;

     

       688
       688
       +
                     man = finalPackage;

     

       689
       689
       +
                   };

     

       690
       690
       +
                 };

     

       673
       691
        
       

     

       674
       674
       -
                 passthru = {

     

       675
       675
       -
                   inherit installedExtensions;

     

       676
       676
       -
                   inherit (postgresql)

     

       677
       677
       -
                     pkgs

     

       678
       678
       -
                     psqlSchema

     

       679
       679
       -
                     version

     

       692
       692
       +
                 withJIT = postgresqlWithPackages {

     

       693
       693
       +
                   inherit

     

       694
       694
       +
                     buildEnv

     

       695
       695
       +
                     lib

     

       696
       696
       +
                     makeBinaryWrapper

     

       697
       697
       +
                     postgresql

     

       698
       698
       +
                     ;

     

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

     

       700
       700
       +
                 withoutJIT = postgresqlWithPackages {

     

       701
       701
       +
                   inherit

     

       702
       702
       +
                     buildEnv

     

       703
       703
       +
                     lib

     

       704
       704
       +
                     makeBinaryWrapper

     

       705
       705
       +
                     postgresql

     

       680
       706
        
                     ;

     

       681
       681
       -
       

     

       682
       682
       -
                   pg_config = postgresql.pg_config.override { inherit finalPackage; };

     

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

     

       683
       708
        
       

     

       684
       684
       -
                   withJIT = postgresqlWithPackages {

     

       685
       685
       -
                     inherit

     

       686
       686
       -
                       buildEnv

     

       687
       687
       -
                       lib

     

       688
       688
       -
                       makeBinaryWrapper

     

       689
       689
       -
                       postgresql

     

       690
       690
       -
                       ;

     

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

     

       692
       692
       -
                   withoutJIT = postgresqlWithPackages {

     

       709
       709
       +
                 withPackages =

     

       710
       710
       +
                   f':

     

       711
       711
       +
                   postgresqlWithPackages {

     

       693
       712
        
                     inherit

     

       694
       713
        
                       buildEnv

     

       695
       714
        
                       lib

     

       696
       715
        
                       makeBinaryWrapper

     

       697
       716
        
                       postgresql

     

       698
       717
        
                       ;

     

       699
       699
       -
                   } (_: lib.remove postgresql.jit installedExtensions);

     

       700
       700
       -
       

     

       701
       701
       -
                   withPackages =

     

       702
       702
       -
                     f':

     

       703
       703
       -
                     postgresqlWithPackages {

     

       704
       704
       -
                       inherit

     

       705
       705
       -
                         buildEnv

     

       706
       706
       -
                         lib

     

       707
       707
       -
                         makeBinaryWrapper

     

       708
       708
       -
                         postgresql

     

       709
       709
       -
                         ;

     

       710
       710
       -
                     } (ps: installedExtensions ++ f' ps);

     

       711
       711
       -
                 };

     

       712
       712
       -
               }).overrideAttrs

     

       713
       713
       -
                 {

     

       714
       714
       -
                   # buildEnv doesn't support passing `outputs`, so going via overrideAttrs.

     

       715
       715
       -
                   outputs = [

     

       716
       716
       -
                     "out"

     

       717
       717
       -
                     "dev"

     

       718
       718
       -
                   ];

     

       719
       719
       -
                 };

     

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

     

       719
       719
       +
               };

     

       720
       720
       +
             };

     

       720
       721
        
           in

     

       721
       722
        
           finalPackage;

     

       722
       723

pkgs/servers/sql/postgresql/libpq.nix

···

       128
       128
        
           make -C src/interfaces/libpq install

     

       129
       129
        
           make -C src/port install

     

       130
       130
        
       

     

       131
       131
       +
           substituteInPlace src/common/pg_config.env \

     

       132
       132
       +
             --replace-fail "$out" "@out@"

     

       133
       133
       +
       

     

       131
       134
        
           install -D src/common/pg_config.env "$dev/nix-support/pg_config.env"

     

       132
       135
        
           moveToOutput "lib/*.a" "$dev"

     

       133
       136
        
       

     
···

       151
       154
        
       

     

       152
       155
        
         passthru.pg_config = buildPackages.callPackage ./pg_config.nix {

     

       153
       156
        
           inherit (finalAttrs) finalPackage;

     

       157
       157
       +
           outputs = {

     

       158
       158
       +
             out = lib.getOutput "out" finalAttrs.finalPackage;

     

       159
       159
       +
           };

     

       154
       160
        
         };

     

       155
       161
        
       

     

       156
       162
        
         meta = {

+9 -2

pkgs/servers/sql/postgresql/pg_config.nix

···

       6
       6
        
         stdenv,

     

       7
       7
        
         # PostgreSQL package

     

       8
       8
        
         finalPackage,

     

       9
       9
       +
         # PostgreSQL package's outputs

     

       10
       10
       +
         outputs,

     

       9
       11
        
       }:

     

       10
       12
        
       

     

       11
       13
        
       replaceVarsWith {

     
···

       15
       17
        
         isExecutable = true;

     

       16
       18
        
         replacements = {

     

       17
       19
        
           inherit runtimeShell;

     

       18
       18
       -
           postgresql-dev = lib.getDev finalPackage;

     

       20
       20
       +
           "pg_config.env" = replaceVarsWith {

     

       21
       21
       +
             name = "pg_config.env";

     

       22
       22
       +
             src = "${lib.getDev finalPackage}/nix-support/pg_config.env";

     

       23
       23
       +
             replacements = outputs;

     

       24
       24
       +
           };

     

       19
       25
        
         };

     

       20
       26
        
         nativeCheckInputs = [

     

       21
       27
        
           diffutils

     

       22
       28
        
         ];

     

       23
       23
       -
         postCheck = ''

     

       29
       29
       +
         # The expected output only matches when outputs have *not* been altered by postgresql.withPackages.

     

       30
       30
       +
         postCheck = lib.optionalString (outputs.out == lib.getOutput "out" finalPackage) ''

     

       24
       31
        
           if [ -e ${lib.getDev finalPackage}/nix-support/pg_config.expected ]; then

     

       25
       32
        
               diff ${lib.getDev finalPackage}/nix-support/pg_config.expected <($out/bin/pg_config)

     

       26
       33
        
           fi

+1 -1

pkgs/servers/sql/postgresql/pg_config.sh

···

       13
       13
        
       #   https://github.com/postgres/postgres/blob/7510ac6203bc8e3c56eae95466feaeebfc1b4f31/src/bin/pg_config/pg_config.sh

     

       14
       14
        
       #   https://github.com/postgres/postgres/blob/master/src/bin/pg_config/pg_config.c

     

       15
       15
        
       

     

       16
       16
       -
       source @postgresql-dev@/nix-support/pg_config.env

     

       16
       16
       +
       source @pg_config.env@

     

       17
       17
        
       

     

       18
       18
        
       help="

     

       19
       19
        
       pg_config provides information about the installed version of PostgreSQL.