commit 546ece569b66f3995839ffe87726177831aca72e · pyrox.dev/nixpkgs

+2 -2

pkgs/applications/blockchains/lighthouse/default.nix

···

       7
       7
        
       , nix-update-script

     

       8
       8
        
       , openssl

     

       9
       9
        
       , pkg-config

     

       10
       10
       -
       , postgresql

     

       10
       10
       +
       , libpq

     

       11
       11
        
       , protobuf

     

       12
       12
        
       , rustPlatform

     

       13
       13
        
       , rust-jemalloc-sys

     
···

       130
       130
        
         ];

     

       131
       131
        
       

     

       132
       132
        
         nativeCheckInputs = [

     

       133
       133
       -
           postgresql

     

       133
       133
       +
           libpq

     

       134
       134
        
         ];

     

       135
       135
        
       

     

       136
       136
        
         passthru = {

+3 -3

pkgs/applications/gis/grass/default.nix

···

       27
       27
        
       , netcdf

     

       28
       28
        
       , pdal

     

       29
       29
        
       , pkg-config

     

       30
       30
       -
       , postgresql

     

       30
       30
       +
       , libpq

     

       31
       31
        
       , proj

     

       32
       32
        
       , python3Packages

     

       33
       33
        
       , readline

     
···

       75
       75
        
           libxml2

     

       76
       76
        
           netcdf

     

       77
       77
        
           pdal

     

       78
       78
       -
           postgresql

     

       78
       78
       +
           libpq

     

       79
       79
        
           proj

     

       80
       80
        
           readline

     

       81
       81
        
           sqlite

     
···

       102
       102
        
           "--with-openmp"

     

       103
       103
        
           "--with-pdal"

     

       104
       104
        
           "--with-postgres"

     

       105
       105
       -
           "--with-postgres-libs=${postgresql.lib}/lib/"

     

       105
       105
       +
           "--with-postgres-libs=${libpq}/lib/"

     

       106
       106
        
           "--with-proj-includes=${proj.dev}/include"

     

       107
       107
        
           "--with-proj-libs=${proj}/lib"

     

       108
       108
        
           "--with-proj-share=${proj}/share/proj"

+2 -2

pkgs/applications/gis/qgis/unwrapped-ltr.nix

···

       21
       21
        
         grass,

     

       22
       22
        
         gsl,

     

       23
       23
        
         hdf5,

     

       24
       24
       +
         libpq,

     

       24
       25
        
         libspatialindex,

     

       25
       26
        
         libspatialite,

     

       26
       27
        
         libzip,

     
···

       28
       29
        
         ninja,

     

       29
       30
        
         openssl,

     

       30
       31
        
         pdal,

     

       31
       31
       -
         postgresql,

     

       32
       32
        
         proj,

     

       33
       33
        
         protobuf,

     

       34
       34
        
         python3,

     
···

       116
       116
        
             geos

     

       117
       117
        
             gsl

     

       118
       118
        
             hdf5

     

       119
       119
       +
             libpq

     

       119
       120
        
             libspatialindex

     

       120
       121
        
             libspatialite

     

       121
       122
        
             libzip

     

       122
       123
        
             netcdf

     

       123
       124
        
             openssl

     

       124
       125
        
             pdal

     

       125
       125
       -
             postgresql

     

       126
       126
        
             proj

     

       127
       127
        
             protobuf

     

       128
       128
        
             qca-qt5

+2 -2

pkgs/applications/gis/qgis/unwrapped.nix

···

       27
       27
        
       , ninja

     

       28
       28
        
       , openssl

     

       29
       29
        
       , pdal

     

       30
       30
       -
       , postgresql

     

       30
       30
       +
       , libpq

     

       31
       31
        
       , proj

     

       32
       32
        
       , protobuf

     

       33
       33
        
       , python3

     
···

       119
       119
        
           netcdf

     

       120
       120
        
           openssl

     

       121
       121
        
           pdal

     

       122
       122
       -
           postgresql

     

       122
       122
       +
           libpq

     

       123
       123
        
           proj

     

       124
       124
        
           protobuf

     

       125
       125
        
           qca-qt5

+4 -5

pkgs/applications/misc/pgmodeler/default.nix

···

       9
       9
        
         qmake,

     

       10
       10
        
         qtwayland,

     

       11
       11
        
         qtsvg,

     

       12
       12
       -
         postgresql,

     

       12
       12
       +
         libpq,

     

       13
       13
        
         cups,

     

       14
       14
        
         libxml2,

     

       15
       15
        
       }:

     
···

       37
       37
        
             "CONFIG+=release"

     

       38
       38
        
           ]

     

       39
       39
        
           ++ lib.optionals stdenv.hostPlatform.isDarwin [

     

       40
       40
       -
             "PGSQL_INC=${lib.getDev postgresql}/include"

     

       41
       41
       -
             "PGSQL_LIB=${lib.getLib postgresql}/lib/libpq.dylib"

     

       40
       40
       +
             "PGSQL_INC=${lib.getDev libpq}/include"

     

       41
       41
       +
             "PGSQL_LIB=${lib.getLib libpq}/lib/libpq.dylib"

     

       42
       42
        
             "XML_INC=${libxml2.dev}/include/libxml2"

     

       43
       43
        
             "XML_LIB=${libxml2.out}/lib/libxml2.dylib"

     

       44
       44
        
             "PREFIX=${placeholder "out"}/Applications/pgModeler.app/Contents"

     

       45
       45
        
           ];

     

       46
       46
        
       

     

       47
       47
       -
         # todo: libpq would suffice here. Unfortunately this won't work, if one uses only postgresql.lib here.

     

       48
       47
        
         buildInputs =

     

       49
       48
        
           [

     

       50
       50
       -
             postgresql

     

       49
       49
       +
             libpq

     

       51
       50
        
             qtsvg

     

       52
       51
        
           ]

     

       53
       52
        
           ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]

+2 -2

pkgs/applications/networking/instant-messengers/teamspeak/server.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchurl,

     

       5
       5
       -
         postgresql,

     

       5
       5
       +
         libpq,

     

       6
       6
        
         autoPatchelfHook,

     

       7
       7
        
         writeScript,

     

       8
       8
        
       }:

     
···

       25
       25
        
       

     

       26
       26
        
         buildInputs = [

     

       27
       27
        
           stdenv.cc.cc

     

       28
       28
       -
           postgresql.lib

     

       28
       28
       +
           libpq

     

       29
       29
        
         ];

     

       30
       30
        
       

     

       31
       31
        
         nativeBuildInputs = [ autoPatchelfHook ];

+2 -2

pkgs/applications/networking/p2p/gnunet/default.nix

···

       3
       3
        
       , makeWrapper, ncurses, pkg-config, libxml2, sqlite, zlib

     

       4
       4
        
       , libpulseaudio, libopus, libogg, jansson, libsodium

     

       5
       5
        
       

     

       6
       6
       -
       , postgresqlSupport ? true, postgresql }:

     

       6
       6
       +
       , postgresqlSupport ? true, libpq }:

     

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         pname = "gnunet";

     
···

       21
       21
        
           adns curl gmp gnutls libextractor libgcrypt libgnurl libidn

     

       22
       22
        
           libmicrohttpd libunistring libxml2 ncurses gettext libsodium

     

       23
       23
        
           sqlite zlib libpulseaudio libopus libogg jansson

     

       24
       24
       -
         ] ++ lib.optional postgresqlSupport postgresql;

     

       24
       24
       +
         ] ++ lib.optional postgresqlSupport libpq;

     

       25
       25
        
       

     

       26
       26
        
         preConfigure = ''

     

       27
       27
        
           # Brute force: since nix-worker chroots don't provide

+2 -2

pkgs/applications/office/kexi/default.nix

···

       30
       30
        
         kreport,

     

       31
       31
        
         lcms2,

     

       32
       32
        
         libmysqlclient,

     

       33
       33
       +
         libpq,

     

       33
       34
        
         marble,

     

       34
       34
       -
         postgresql,

     

       35
       35
        
       }:

     

       36
       36
        
       

     

       37
       37
        
       mkDerivation rec {

     
···

       74
       74
        
           kreport

     

       75
       75
        
           lcms2

     

       76
       76
        
           libmysqlclient

     

       77
       77
       +
           libpq

     

       77
       78
        
           marble

     

       78
       78
       -
           postgresql

     

       79
       79
        
         ];

     

       80
       80
        
       

     

       81
       81
        
         propagatedUserEnvPkgs = [ kproperty ];

+2 -2

pkgs/applications/office/ledger-web/default.nix

···

       3
       3
        
         bundlerApp,

     

       4
       4
        
         bundlerUpdateScript,

     

       5
       5
        
         withPostgresql ? true,

     

       6
       6
       -
         postgresql,

     

       6
       6
       +
         libpq,

     

       7
       7
        
         withSqlite ? false,

     

       8
       8
        
         sqlite,

     

       9
       9
        
       }:

     
···

       13
       13
        
         gemdir = ./.;

     

       14
       14
        
         exes = [ "ledger_web" ];

     

       15
       15
        
       

     

       16
       16
       -
         buildInputs = lib.optional withPostgresql postgresql ++ lib.optional withSqlite sqlite;

     

       16
       16
       +
         buildInputs = lib.optional withPostgresql libpq ++ lib.optional withSqlite sqlite;

     

       17
       17
        
       

     

       18
       18
        
         passthru.updateScript = bundlerUpdateScript "ledger-web";

     

       19
       19

+2 -2

pkgs/applications/office/libreoffice/default.nix

···

       113
       113
        
       , kwindowsystem ? null

     

       114
       114
        
       , variant ? "fresh"

     

       115
       115
        
       , symlinkJoin

     

       116
       116
       -
       , postgresql

     

       116
       116
       +
       , libpq

     

       117
       117
        
       , makeFontsConf

     

       118
       118
        
       , amiri

     

       119
       119
        
       , caladea

     
···

       395
       395
        
           pam

     

       396
       396
        
           perl

     

       397
       397
        
           poppler

     

       398
       398
       -
           postgresql

     

       398
       398
       +
           libpq

     

       399
       399
        
           python311

     

       400
       400
        
           sane-backends

     

       401
       401
        
           unixODBC

+2 -2

pkgs/build-support/rust/default-crate-overrides.nix

···

       34
       34
        
       , openssl

     

       35
       35
        
       , pango

     

       36
       36
        
       , pkg-config

     

       37
       37
       -
       , postgresql

     

       37
       37
       +
       , libpq

     

       38
       38
        
       , protobuf

     

       39
       39
        
       , python3

     

       40
       40
        
       , rdkafka

     
···

       259
       259
        
       

     

       260
       260
        
         pq-sys = attr: {

     

       261
       261
        
           nativeBuildInputs = [ pkg-config ];

     

       262
       262
       -
           buildInputs = [ postgresql ];

     

       262
       262
       +
           buildInputs = [ libpq ];

     

       263
       263
        
         };

     

       264
       264
        
       

     

       265
       265
        
         prost-build = attr: {

+2 -2

pkgs/by-name/al/algol68g/package.nix

···

       5
       5
        
         curl,

     

       6
       6
        
         gmp,

     

       7
       7
        
         gsl,

     

       8
       8
       +
         libpq,

     

       8
       9
        
         mpfr,

     

       9
       10
        
         ncurses,

     

       10
       11
        
         plotutils,

     

       11
       11
       -
         postgresql,

     

       12
       12
        
         pkg-config,

     

       13
       13
        
         withPDFDoc ? true,

     

       14
       14
        
       }:

     
···

       38
       38
        
           gmp

     

       39
       39
        
           gsl

     

       40
       40
        
           plotutils

     

       41
       41
       -
           postgresql

     

       41
       41
       +
           libpq

     

       42
       42
        
         ];

     

       43
       43
        
       

     

       44
       44
        
         strictDeps = true;

+2 -2

pkgs/by-name/cp/cppdb/package.nix

···

       5
       5
        
         cmake,

     

       6
       6
        
         sqlite,

     

       7
       7
        
         libmysqlclient,

     

       8
       8
       -
         postgresql,

     

       8
       8
       +
         libpq,

     

       9
       9
        
         unixODBC,

     

       10
       10
        
       }:

     

       11
       11
        
       

     
···

       22
       22
        
         buildInputs = [

     

       23
       23
        
           sqlite

     

       24
       24
        
           libmysqlclient

     

       25
       25
       -
           postgresql

     

       25
       25
       +
           libpq

     

       26
       26
        
           unixODBC

     

       27
       27
        
         ];

     

       28
       28

+2 -2

pkgs/by-name/cy/cyrus-imapd/package.nix

···

       27
       27
        
         libchardet,

     

       28
       28
        
         libical,

     

       29
       29
        
         libmysqlclient,

     

       30
       30
       +
         libpq,

     

       30
       31
        
         libsrs2,

     

       31
       32
        
         libuuid,

     

       32
       33
        
         libxml2,

     
···

       34
       35
        
         openssl,

     

       35
       36
        
         pcre2,

     

       36
       37
        
         perl,

     

       37
       37
       -
         postgresql,

     

       38
       38
        
         rsync,

     

       39
       39
        
         shapelib,

     

       40
       40
        
         sqlite,

     
···

       115
       115
        
             xapian

     

       116
       116
        
           ]

     

       117
       117
        
           ++ lib.optionals withMySQL [ libmysqlclient ]

     

       118
       118
       -
           ++ lib.optionals withPgSQL [ postgresql ]

     

       118
       118
       +
           ++ lib.optionals withPgSQL [ libpq ]

     

       119
       119
        
           ++ lib.optionals withSQLite [ sqlite ];

     

       120
       120
        
       

     

       121
       121
        
         enableParallelBuilding = true;

+2 -2

pkgs/by-name/di/diesel-cli/package.nix

···

       6
       6
        
         installShellFiles,

     

       7
       7
        
         libiconv,

     

       8
       8
        
         libmysqlclient,

     

       9
       9
       +
         libpq,

     

       9
       10
        
         nix-update-script,

     

       10
       11
        
         openssl,

     

       11
       12
        
         pkg-config,

     

       12
       12
       -
         postgresql,

     

       13
       13
        
         rustPlatform,

     

       14
       14
        
         sqlite,

     

       15
       15
        
         testers,

     
···

       45
       45
        
         buildInputs =

     

       46
       46
        
           [ openssl ]

     

       47
       47
        
           ++ lib.optional sqliteSupport sqlite

     

       48
       48
       -
           ++ lib.optional postgresqlSupport postgresql

     

       48
       48
       +
           ++ lib.optional postgresqlSupport libpq

     

       49
       49
        
           ++ lib.optionals mysqlSupport [

     

       50
       50
        
             libmysqlclient

     

       51
       51
        
             zlib

+2 -2

pkgs/by-name/dr/drogon/package.nix

···

       14
       14
        
         sqliteSupport ? true,

     

       15
       15
        
         sqlite,

     

       16
       16
        
         postgresSupport ? false,

     

       17
       17
       -
         postgresql,

     

       17
       17
       +
         libpq,

     

       18
       18
        
         redisSupport ? false,

     

       19
       19
        
         hiredis,

     

       20
       20
        
         mysqlSupport ? false,

     
···

       51
       51
        
             c-ares

     

       52
       52
        
           ]

     

       53
       53
        
           ++ lib.optional sqliteSupport sqlite

     

       54
       54
       -
           ++ lib.optional postgresSupport postgresql

     

       54
       54
       +
           ++ lib.optional postgresSupport libpq

     

       55
       55
        
           ++ lib.optional redisSupport hiredis

     

       56
       56
        
           # drogon uses mariadb for mysql (see https://github.com/drogonframework/drogon/wiki/ENG-02-Installation#Library-Dependencies)

     

       57
       57
        
           ++ lib.optionals mysqlSupport [

+3 -3

pkgs/by-name/ds/dspam/package.nix

···

       13
       13
        
         zlib,

     

       14
       14
        
         mariadb-connector-c,

     

       15
       15
        
         withPgSQL ? false,

     

       16
       16
       -
         postgresql,

     

       16
       16
       +
         libpq,

     

       17
       17
        
         withSQLite ? false,

     

       18
       18
        
         sqlite,

     

       19
       19
        
         withDB ? false,

     
···

       56
       56
        
             zlib

     

       57
       57
        
             mariadb-connector-c.out

     

       58
       58
        
           ]

     

       59
       59
       -
           ++ lib.optional withPgSQL postgresql

     

       59
       59
       +
           ++ lib.optional withPgSQL libpq

     

       60
       60
        
           ++ lib.optional withSQLite sqlite

     

       61
       61
        
           ++ lib.optional withDB db;

     

       62
       62
        
         nativeBuildInputs = [ makeWrapper ];

     
···

       88
       88
        
             "--with-mysql-includes=${mariadb-connector-c.dev}/include/mysql"

     

       89
       89
        
             "--with-mysql-libraries=${mariadb-connector-c.out}/lib/mysql"

     

       90
       90
        
           ]

     

       91
       91
       -
           ++ lib.optional withPgSQL "--with-pgsql-libraries=${postgresql.lib}/lib";

     

       91
       91
       +
           ++ lib.optional withPgSQL "--with-pgsql-libraries=${libpq}/lib";

     

       92
       92
        
       

     

       93
       93
        
         # Workaround build failure on -fno-common toolchains like upstream

     

       94
       94
        
         # gcc-10. Otherwise build fails as:

+4 -4

pkgs/by-name/ex/exim/package.nix

···

       17
       17
        
         libmysqlclient,

     

       18
       18
        
         zlib,

     

       19
       19
        
         enablePgSQL ? false,

     

       20
       20
       -
         postgresql,

     

       20
       20
       +
         libpq,

     

       21
       21
        
         enableSqlite ? false,

     

       22
       22
        
         sqlite,

     

       23
       23
        
         enableAuthDovecot ? false,

     
···

       63
       63
        
             libmysqlclient

     

       64
       64
        
             zlib

     

       65
       65
        
           ]

     

       66
       66
       -
           ++ lib.optional enablePgSQL postgresql

     

       66
       66
       +
           ++ lib.optional enablePgSQL libpq

     

       67
       67
        
           ++ lib.optionals enableSqlite [

     

       68
       68
        
             sqlite

     

       69
       69
        
             sqlite.dev

     
···

       117
       117
        
             ''}

     

       118
       118
        
             ${lib.optionalString enablePgSQL ''

     

       119
       119
        
               s:^# \(LOOKUP_PGSQL=yes\)$:\1:

     

       120
       120
       -
               s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lpq -L${postgresql.lib}/lib:

     

       121
       121
       -
               s:^# \(LOOKUP_LIBS\)=.*:\1=-lpq -L${postgresql.lib}/lib:

     

       120
       120
       +
               s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lpq -L${libpq}/lib:

     

       121
       121
       +
               s:^# \(LOOKUP_LIBS\)=.*:\1=-lpq -L${libpq}/lib:

     

       122
       122
        
             ''}

     

       123
       123
        
             ${lib.optionalString enableSqlite ''

     

       124
       124
        
               s:^# \(LOOKUP_SQLITE=yes\)$:\1:

+2 -2

pkgs/by-name/fl/fluent-bit/package.nix

···

       6
       6
        
         flex,

     

       7
       7
        
         bison,

     

       8
       8
        
         systemd,

     

       9
       9
       -
         postgresql,

     

       9
       9
       +
         libpq,

     

       10
       10
        
         openssl,

     

       11
       11
        
         libyaml,

     

       12
       12
        
         darwin,

     
···

       36
       36
        
           [

     

       37
       37
        
             openssl

     

       38
       38
        
             libyaml

     

       39
       39
       -
             postgresql

     

       39
       39
       +
             libpq

     

       40
       40
        
           ]

     

       41
       41
        
           ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ]

     

       42
       42
        
           ++ lib.optionals stdenv.hostPlatform.isDarwin [

+2 -2

pkgs/by-name/fr/freeradius/package.nix

···

       21
       21
        
         withMysql ? false,

     

       22
       22
        
         libmysqlclient,

     

       23
       23
        
         withPostgresql ? false,

     

       24
       24
       -
         postgresql,

     

       24
       24
       +
         libpq,

     

       25
       25
        
         withPcap ? true,

     

       26
       26
        
         libpcap,

     

       27
       27
        
         withRedis ? false,

     
···

       62
       62
        
           ++ lib.optional withLdap openldap

     

       63
       63
        
           ++ lib.optional withMemcached libmemcached

     

       64
       64
        
           ++ lib.optional withMysql libmysqlclient

     

       65
       65
       -
           ++ lib.optional withPostgresql postgresql

     

       65
       65
       +
           ++ lib.optional withPostgresql libpq

     

       66
       66
        
           ++ lib.optional withPcap libpcap

     

       67
       67
        
           ++ lib.optional withRedis hiredis

     

       68
       68
        
           ++ lib.optional withRest curl

+2 -2

pkgs/by-name/ga/gammu/package.nix

···

       17
       17
        
         libdbi ? null,

     

       18
       18
        
         libdbiDrivers ? null,

     

       19
       19
        
         postgresSupport ? false,

     

       20
       20
       -
         postgresql ? null,

     

       20
       20
       +
         libpq ? null,

     

       21
       21
        
       }:

     

       22
       22
        
       

     

       23
       23
        
       stdenv.mkDerivation rec {

     
···

       60
       60
        
             libdbi

     

       61
       61
        
             libdbiDrivers

     

       62
       62
        
           ]

     

       63
       63
       -
           ++ lib.optionals postgresSupport [ postgresql ];

     

       63
       63
       +
           ++ lib.optionals postgresSupport [ libpq ];

     

       64
       64
        
       

     

       65
       65
        
         meta = with lib; {

     

       66
       66
        
           homepage = "https://wammu.eu/gammu/";

+2 -2

pkgs/by-name/in/inspircd/package.nix

···

       67
       67
        
       , pkg-config

     

       68
       68
        
       , libargon2

     

       69
       69
        
       , openldap

     

       70
       70
       -
       , postgresql

     

       70
       70
       +
       , libpq

     

       71
       71
        
       , libmysqlclient

     

       72
       72
        
       , pcre

     

       73
       73
        
       , pcre2

     
···

       97
       97
        
           ];

     

       98
       98
        
           ldap            = [ openldap ];

     

       99
       99
        
           mysql           = [ libmysqlclient ];

     

       100
       100
       -
           pgsql           = [ postgresql ];

     

       100
       100
       +
           pgsql           = [ libpq ];

     

       101
       101
        
           regex_pcre      = [ pcre ];

     

       102
       102
        
           regex_pcre2     = [ pcre2 ];

     

       103
       103
        
           regex_re2       = [ re2 ];

+2 -2

pkgs/by-name/ke/kepler/package.nix

···

       3
       3
        
         stdenv,

     

       4
       4
        
         darwin,

     

       5
       5
        
         fetchFromGitHub,

     

       6
       6
       +
         libpq,

     

       6
       7
        
         openssl,

     

       7
       8
        
         pkg-config,

     

       8
       8
       -
         postgresql,

     

       9
       9
        
         rustPlatform,

     

       10
       10
        
         zstd,

     

       11
       11
        
       }:

     
···

       29
       29
        
       

     

       30
       30
        
         buildInputs =

     

       31
       31
        
           [

     

       32
       32
       +
             libpq

     

       32
       33
        
             openssl

     

       33
       33
       -
             postgresql

     

       34
       34
        
             zstd

     

       35
       35
        
           ]

     

       36
       36
        
           ++ lib.optionals stdenv.hostPlatform.isDarwin [

+4 -3

pkgs/by-name/li/libdbiDrivers/package.nix

···

       6
       6
        
         # TODO: migrate away from overriding packages to null

     

       7
       7
        
         libmysqlclient ? null,

     

       8
       8
        
         sqlite ? null,

     

       9
       9
       -
         postgresql ? null,

     

       9
       9
       +
         libpq ? null,

     

       10
       10
        
       }:

     

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation rec {

     
···

       21
       21
        
         buildInputs = [

     

       22
       22
        
           libdbi

     

       23
       23
        
           sqlite

     

       24
       24
       -
           postgresql

     

       25
       24
        
         ] ++ lib.optional (libmysqlclient != null) libmysqlclient;

     

       26
       25
        
       

     

       27
       26
        
         patches = [

     
···

       58
       57
        
             "--with-sqlite3-incdir=${sqlite.dev}/include/sqlite"

     

       59
       58
        
             "--with-sqlite3-libdir=${sqlite.out}/lib/sqlite"

     

       60
       59
        
           ]

     

       61
       61
       -
           ++ lib.optionals (postgresql != null) [

     

       60
       60
       +
           ++ lib.optionals (libpq != null) [

     

       62
       61
        
             "--with-pgsql"

     

       62
       62
       +
             "--with-pgsql-incdir=${libpq.dev}/include"

     

       63
       63
       +
             "--with-pgsql-libdir=${libpq}/lib/"

     

       63
       64
        
           ];

     

       64
       65
        
       

     

       65
       66
        
         env.NIX_CFLAGS_COMPILE = toString (

+2 -3

pkgs/by-name/li/libpqxx/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       -
         postgresql,

     

       5
       5
       +
         libpq,

     

       6
       6
        
         python3,

     

       7
       7
        
       }:

     

       8
       8
        
       

     
···

       23
       23
        
         ];

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [

     

       26
       26
       -
           postgresql.dev

     

       27
       26
        
           python3

     

       28
       27
        
         ];

     

       29
       28
        
       

     

       30
       29
        
         buildInputs = [

     

       31
       31
       -
           postgresql.lib

     

       30
       30
       +
           libpq

     

       32
       31
        
         ];

     

       33
       32
        
       

     

       34
       33
        
         postPatch = ''

+2 -2

pkgs/by-name/lu/luanti/package.nix

···

       26
       26
        
         gmp,

     

       27
       27
        
         libspatialindex,

     

       28
       28
        
         leveldb,

     

       29
       29
       -
         postgresql,

     

       29
       29
       +
         libpq,

     

       30
       30
        
         hiredis,

     

       31
       31
        
         libiconv,

     

       32
       32
        
         ninja,

     
···

       132
       132
        
           ]

     

       133
       133
        
           ++ lib.optionals buildServer [

     

       134
       134
        
             leveldb

     

       135
       135
       -
             postgresql

     

       135
       135
       +
             libpq

     

       136
       136
        
             hiredis

     

       137
       137
        
             prometheus-cpp

     

       138
       138
        
           ];

+2 -2

pkgs/by-name/ma/mapserver/package.nix

···

       17
       17
        
         harfbuzz,

     

       18
       18
        
         libjpeg,

     

       19
       19
        
         libpng,

     

       20
       20
       +
         libpq,

     

       20
       21
        
         librsvg,

     

       21
       22
        
         libxml2,

     

       22
       23
        
         pkg-config,

     

       23
       23
       -
         postgresql,

     

       24
       24
        
         proj,

     

       25
       25
        
         protobufc,

     

       26
       26
        
         python3,

     
···

       61
       61
        
           harfbuzz

     

       62
       62
        
           libjpeg

     

       63
       63
        
           libpng

     

       64
       64
       +
           libpq

     

       64
       65
        
           librsvg

     

       65
       66
        
           libxml2

     

       66
       66
       -
           postgresql

     

       67
       67
        
           proj

     

       68
       68
        
           protobufc

     

       69
       69
        
           zlib

+2 -2

pkgs/by-name/n8/n8n/package.nix

···

       10
       10
        
         xcbuild,

     

       11
       11
        
         libkrb5,

     

       12
       12
        
         libmongocrypt,

     

       13
       13
       -
         postgresql,

     

       13
       13
       +
         libpq,

     

       14
       14
        
         makeWrapper,

     

       15
       15
        
       }:

     

       16
       16
        
       

     
···

       41
       41
        
           nodejs

     

       42
       42
        
           libkrb5

     

       43
       43
        
           libmongocrypt

     

       44
       44
       -
           postgresql

     

       44
       44
       +
           libpq

     

       45
       45
        
         ];

     

       46
       46
        
       

     

       47
       47
        
         buildPhase = ''

+5 -3

pkgs/by-name/od/odyssey/package.nix

···

       4
       4
        
         fetchFromGitHub,

     

       5
       5
        
         cmake,

     

       6
       6
        
         openssl,

     

       7
       7
       -
         postgresql,

     

       7
       7
       +
         libpq,

     

       8
       8
        
         zstd,

     

       9
       9
        
         fetchpatch,

     

       10
       10
        
       }:

     
···

       31
       31
        
         nativeBuildInputs = [ cmake ];

     

       32
       32
        
         buildInputs = [

     

       33
       33
        
           openssl

     

       34
       34
       -
           postgresql

     

       34
       34
       +
           libpq

     

       35
       35
        
           zstd

     

       36
       36
        
         ];

     

       37
       37
        
         cmakeFlags = [

     

       38
       38
       -
           "-DPQ_LIBRARY=${postgresql.lib}/lib"

     

       39
       38
        
           "-DBUILD_COMPRESSION=ON"

     

       39
       39
       +
           "-DPOSTGRESQL_INCLUDE_DIR=${lib.getDev libpq}/include/postgresql/server"

     

       40
       40
       +
           "-DPOSTGRESQL_LIBRARY=${libpq}/lib"

     

       41
       41
       +
           "-DPOSTGRESQL_LIBPGPORT=${lib.getDev libpq}/lib"

     

       40
       42
        
         ];

     

       41
       43
        
       

     

       42
       44
        
         installPhase = ''

+2 -2

pkgs/by-name/op/opendbx/package.nix

···

       4
       4
        
         fetchurl,

     

       5
       5
        
         readline,

     

       6
       6
        
         libmysqlclient,

     

       7
       7
       -
         postgresql,

     

       7
       7
       +
         libpq,

     

       8
       8
        
         sqlite,

     

       9
       9
        
       }:

     

       10
       10
        
       

     
···

       30
       30
        
         buildInputs = [

     

       31
       31
        
           readline

     

       32
       32
        
           libmysqlclient

     

       33
       33
       -
           postgresql

     

       33
       33
       +
           libpq

     

       34
       34
        
           sqlite

     

       35
       35
        
         ];

     

       36
       36

+2 -2

pkgs/by-name/os/osm2pgsql/package.nix

···

       10
       10
        
         cli11,

     

       11
       11
        
         zlib,

     

       12
       12
        
         boost,

     

       13
       13
       -
         postgresql,

     

       13
       13
       +
         libpq,

     

       14
       14
        
         python3,

     

       15
       15
        
         withLuaJIT ? false,

     

       16
       16
        
         lua,

     
···

       49
       49
        
             expat

     

       50
       50
        
             fmt_11

     

       51
       51
        
             libosmium

     

       52
       52
       +
             libpq

     

       52
       53
        
             nlohmann_json

     

       53
       54
        
             opencv

     

       54
       54
       -
             postgresql

     

       55
       55
        
             potrace

     

       56
       56
        
             proj

     

       57
       57
        
             protozero

+2 -2

pkgs/by-name/pa/pam_pgsql/package.nix

···

       4
       4
        
         fetchFromGitHub,

     

       5
       5
        
         autoreconfHook,

     

       6
       6
        
         pkg-config,

     

       7
       7
       -
         postgresql,

     

       7
       7
       +
         libpq,

     

       8
       8
        
         libgcrypt,

     

       9
       9
        
         pam,

     

       10
       10
        
         libxcrypt,

     
···

       28
       28
        
         buildInputs = [

     

       29
       29
        
           libgcrypt

     

       30
       30
        
           pam

     

       31
       31
       -
           postgresql

     

       31
       31
       +
           libpq

     

       32
       32
        
           libxcrypt

     

       33
       33
        
         ];

     

       34
       34

+2 -2

pkgs/by-name/pd/pdal/package.nix

···

       18
       18
        
       , libxml2

     

       19
       19
        
       , openscenegraph

     

       20
       20
        
       , pkg-config

     

       21
       21
       -
       , postgresql

     

       21
       21
       +
       , libpq

     

       22
       22
        
       , proj

     

       23
       23
        
       , sqlite

     

       24
       24
        
       , tiledb

     
···

       52
       52
        
           libtiff

     

       53
       53
        
           libxml2

     

       54
       54
        
           openscenegraph

     

       55
       55
       -
           postgresql

     

       55
       55
       +
           libpq

     

       56
       56
        
           proj

     

       57
       57
        
           sqlite

     

       58
       58
        
           tiledb

+2 -2

pkgs/by-name/pd/pdns/package.nix

···

       12
       12
        
         openssl,

     

       13
       13
        
         systemd,

     

       14
       14
        
         mariadb-connector-c,

     

       15
       15
       -
         postgresql,

     

       15
       15
       +
         libpq,

     

       16
       16
        
         lua,

     

       17
       17
        
         openldap,

     

       18
       18
        
         geoip,

     
···

       37
       37
        
         buildInputs = [

     

       38
       38
        
           boost

     

       39
       39
        
           mariadb-connector-c

     

       40
       40
       -
           postgresql

     

       40
       40
       +
           libpq

     

       41
       41
        
           lua

     

       42
       42
        
           openldap

     

       43
       43
        
           sqlite

+2 -2

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

···

       9
       9
        
         libbacktrace,

     

       10
       10
        
         bzip2,

     

       11
       11
        
         lz4,

     

       12
       12
       -
         postgresql,

     

       12
       12
       +
         libpq,

     

       13
       13
        
         libxml2,

     

       14
       14
        
         libyaml,

     

       15
       15
        
         zlib,

     
···

       41
       41
        
           libbacktrace

     

       42
       42
        
           bzip2

     

       43
       43
        
           lz4

     

       44
       44
       -
           postgresql

     

       44
       44
       +
           libpq

     

       45
       45
        
           libxml2

     

       46
       46
        
           libyaml

     

       47
       47
        
           zlib

+2 -2

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

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       -
         postgresql,

     

       5
       5
       +
         libpq,

     

       6
       6
        
         openssl,

     

       7
       7
        
         nixosTests,

     

       8
       8
        
       }:

     
···

       29
       29
        
         '';

     

       30
       30
        
       

     

       31
       31
        
         buildInputs = [

     

       32
       32
       -
           postgresql

     

       32
       32
       +
           libpq

     

       33
       33
        
           openssl

     

       34
       34
        
         ];

     

       35
       35

+2 -2

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

···

       1
       1
        
       { lib

     

       2
       2
        
       , stdenv

     

       3
       3
        
       , fetchurl

     

       4
       4
       -
       , postgresql

     

       4
       4
       +
       , libpq

     

       5
       5
        
       , openssl

     

       6
       6
        
       , libxcrypt

     

       7
       7
        
       , withPam ? stdenv.hostPlatform.isLinux

     
···

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         buildInputs = [

     

       22
       22
       -
           postgresql

     

       22
       22
       +
           libpq

     

       23
       23
        
           openssl

     

       24
       24
        
           libxcrypt

     

       25
       25
        
         ] ++ lib.optional withPam pam;

+2 -2

pkgs/by-name/pm/pmacct/package.nix

···

       15
       15
        
         withSQLite ? true,

     

       16
       16
        
         sqlite,

     

       17
       17
        
         withPgSQL ? true,

     

       18
       18
       -
         postgresql,

     

       18
       18
       +
         libpq,

     

       19
       19
        
         withMysql ? true,

     

       20
       20
        
         libmysqlclient,

     

       21
       21
        
         zlib,

     
···

       49
       49
        
           ++ lib.optional withJansson jansson

     

       50
       50
        
           ++ lib.optional withNflog libnetfilter_log

     

       51
       51
        
           ++ lib.optional withSQLite sqlite

     

       52
       52
       -
           ++ lib.optional withPgSQL postgresql

     

       52
       52
       +
           ++ lib.optional withPgSQL libpq

     

       53
       53
        
           ++ lib.optionals withMysql [

     

       54
       54
        
             libmysqlclient

     

       55
       55
        
             zlib

+2 -2

pkgs/by-name/ps/pspg/package.nix

···

       7
       7
        
         pkg-config,

     

       8
       8
        
         installShellFiles,

     

       9
       9
        
         readline,

     

       10
       10
       -
         postgresql,

     

       10
       10
       +
         libpq,

     

       11
       11
        
       }:

     

       12
       12
        
       

     

       13
       13
        
       stdenv.mkDerivation rec {

     
···

       27
       27
        
         ];

     

       28
       28
        
         buildInputs = [

     

       29
       29
        
           gnugrep

     

       30
       30
       +
           libpq

     

       30
       31
        
           ncurses

     

       31
       32
        
           readline

     

       32
       32
       -
           postgresql

     

       33
       33
        
         ];

     

       34
       34
        
       

     

       35
       35
        
         makeFlags = [ "PREFIX=${placeholder "out"}" ];

+4 -4

pkgs/by-name/ps/psqlodbc/package.nix

···

       4
       4
        
         fetchFromGitHub,

     

       5
       5
        
         nix-update-script,

     

       6
       6
        
         autoreconfHook,

     

       7
       7
       -
         postgresql,

     

       7
       7
       +
         libpq,

     

       8
       8
        
         openssl,

     

       9
       9
        
         withLibiodbc ? false,

     

       10
       10
        
         libiodbc,

     
···

       27
       27
        
       

     

       28
       28
        
         buildInputs =

     

       29
       29
        
           [

     

       30
       30
       -
             postgresql

     

       30
       30
       +
             libpq

     

       31
       31
        
             openssl

     

       32
       32
        
           ]

     

       33
       33
        
           ++ lib.optional withLibiodbc libiodbc

     
···

       47
       47
        
           };

     

       48
       48
        
       

     

       49
       49
        
         configureFlags = [

     

       50
       50
       -
           "--with-libpq=${lib.getDev postgresql}/bin/pg_config"

     

       50
       50
       +
           "--with-libpq=${lib.getDev libpq}"

     

       51
       51
        
         ] ++ lib.optional withLibiodbc "--with-iodbc=${libiodbc}";

     

       52
       52
        
       

     

       53
       53
        
         meta = with lib; {

     
···

       55
       55
        
           description = "ODBC driver for PostgreSQL";

     

       56
       56
        
           license = licenses.lgpl2;

     

       57
       57
        
           platforms = platforms.unix;

     

       58
       58
       -
           maintainers = postgresql.meta.maintainers;

     

       58
       58
       +
           maintainers = libpq.meta.maintainers;

     

       59
       59
        
         };

     

       60
       60
        
       }

+2 -2

pkgs/by-name/sa/saga/package.nix

···

       19
       19
        
         opencv,

     

       20
       20
        
         vigra,

     

       21
       21
        
         pdal,

     

       22
       22
       -
         postgresql,

     

       22
       22
       +
         libpq,

     

       23
       23
        
         darwin,

     

       24
       24
        
         unixODBC,

     

       25
       25
        
         poppler,

     
···

       63
       63
        
             libharu

     

       64
       64
        
             opencv

     

       65
       65
        
             vigra

     

       66
       66
       -
             postgresql

     

       66
       66
       +
             libpq

     

       67
       67
        
             libiodbc

     

       68
       68
        
             xz

     

       69
       69
        
             qhull

+3 -3

pkgs/by-name/so/sope/package.nix

···

       1
       1
        
       { gnustep, lib, fetchFromGitHub, fetchpatch, libxml2, openssl

     

       2
       2
       -
       , openldap, mariadb, libmysqlclient, postgresql }:

     

       2
       2
       +
       , openldap, mariadb, libmysqlclient, libpq }:

     

       3
       3
        
       

     

       4
       4
        
       gnustep.stdenv.mkDerivation rec {

     

       5
       5
        
         pname = "sope";

     
···

       16
       16
        
         buildInputs = [ gnustep.base libxml2 openssl ]

     

       17
       17
        
           ++ lib.optional (openldap != null) openldap

     

       18
       18
        
           ++ lib.optionals (mariadb != null) [ libmysqlclient mariadb ]

     

       19
       19
       -
           ++ lib.optional (postgresql != null) postgresql;

     

       19
       19
       +
           ++ lib.optional (libpq != null) libpq;

     

       20
       20
        
       

     

       21
       21
        
         # Configure directories where files are installed to. Everything is automatically

     

       22
       22
        
         # put into $out (thanks GNUstep) apart from the makefiles location which is where

     
···

       33
       33
        
         configureFlags = [ "--prefix=" "--disable-debug" "--enable-xml" "--with-ssl=ssl" ]

     

       34
       34
        
           ++ lib.optional (openldap != null) "--enable-openldap"

     

       35
       35
        
           ++ lib.optional (mariadb != null) "--enable-mysql"

     

       36
       36
       -
           ++ lib.optional (postgresql != null) "--enable-postgresql";

     

       36
       36
       +
           ++ lib.optional (libpq != null) "--enable-postgresql";

     

       37
       37
        
       

     

       38
       38
        
         env = {

     

       39
       39
        
           GNUSTEP_CONFIG_FILE = "/build/GNUstep.conf";

+2 -2

pkgs/by-name/sp/spatialite-gui/package.nix

···

       7
       7
        
         curl,

     

       8
       8
        
         freexl,

     

       9
       9
        
         geos,

     

       10
       10
       +
         libpq,

     

       10
       11
        
         librasterlite2,

     

       11
       12
        
         librttopo,

     

       12
       13
        
         libspatialite,

     
···

       16
       17
        
         lz4,

     

       17
       18
        
         minizip,

     

       18
       19
        
         openjpeg,

     

       19
       19
       -
         postgresql,

     

       20
       20
        
         proj,

     

       21
       21
        
         sqlite,

     

       22
       22
        
         virtualpg,

     
···

       42
       42
        
           curl

     

       43
       43
        
           freexl

     

       44
       44
        
           geos

     

       45
       45
       +
           libpq

     

       45
       46
        
           librasterlite2

     

       46
       47
        
           librttopo

     

       47
       48
        
           libspatialite

     
···

       51
       52
        
           lz4

     

       52
       53
        
           minizip

     

       53
       54
        
           openjpeg

     

       54
       54
       -
           postgresql

     

       55
       55
        
           proj

     

       56
       56
        
           sqlite

     

       57
       57
        
           virtualpg

+2 -2

pkgs/by-name/st/stellar-core/package.nix

···

       7
       7
        
         flex,

     

       8
       8
        
         gitMinimal,

     

       9
       9
        
         lib,

     

       10
       10
       +
         libpq,

     

       10
       11
        
         libtool,

     

       11
       12
        
         libunwind,

     

       12
       13
        
         pkg-config,

     

       13
       13
       -
         postgresql,

     

       14
       14
        
         ripgrep,

     

       15
       15
        
         stdenv,

     

       16
       16
        
       }:

     
···

       60
       60
        
         propagatedBuildInputs = [

     

       61
       61
        
           bison

     

       62
       62
        
           flex

     

       63
       63
       -
           postgresql

     

       63
       63
       +
           libpq

     

       64
       64
        
         ];

     

       65
       65
        
       

     

       66
       66
        
         enableParallelBuilding = true;

+2 -2

pkgs/by-name/sy/syndicate_utils/package.nix

···

       5
       5
        
         libxml2,

     

       6
       6
        
         libxslt,

     

       7
       7
        
         openssl,

     

       8
       8
       -
         postgresql,

     

       8
       8
       +
         libpq,

     

       9
       9
        
         sqlite,

     

       10
       10
        
       }:

     

       11
       11
        
       

     
···

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         buildInputs = [

     

       25
       25
       -
           postgresql.out

     

       25
       25
       +
           libpq

     

       26
       26
        
           sqlite

     

       27
       27
        
           libxml2

     

       28
       28
        
           libxslt

+2 -2

pkgs/by-name/ta/taler-challenger/package.nix

···

       13
       13
        
         libmicrohttpd,

     

       14
       14
        
         libsodium,

     

       15
       15
        
         libtool,

     

       16
       16
       -
         postgresql,

     

       16
       16
       +
         libpq,

     

       17
       17
        
         taler-exchange,

     

       18
       18
        
         taler-merchant,

     

       19
       19
        
         runtimeShell,

     
···

       59
       59
        
           libgcrypt

     

       60
       60
        
           libgnurl

     

       61
       61
        
           libmicrohttpd

     

       62
       62
       +
           libpq

     

       62
       63
        
           libsodium

     

       63
       64
        
           libtool

     

       64
       64
       -
           postgresql

     

       65
       65
        
           taler-exchange

     

       66
       66
        
           taler-merchant

     

       67
       67
        
         ];

+2 -2

pkgs/by-name/ta/taler-exchange/package.nix

···

       10
       10
        
         libsodium,

     

       11
       11
        
         libunistring,

     

       12
       12
        
         pkg-config,

     

       13
       13
       -
         postgresql,

     

       13
       13
       +
         libpq,

     

       14
       14
        
         autoreconfHook,

     

       15
       15
        
         python3,

     

       16
       16
        
         recutils,

     
···

       43
       43
        
           libmicrohttpd

     

       44
       44
        
           jansson

     

       45
       45
        
           libsodium

     

       46
       46
       -
           postgresql

     

       46
       46
       +
           libpq

     

       47
       47
        
           curl

     

       48
       48
        
           recutils

     

       49
       49
        
           gettext

+2 -2

pkgs/by-name/ta/taler-sync/package.nix

···

       9
       9
        
         gnunet,

     

       10
       10
        
         jansson,

     

       11
       11
        
         libmicrohttpd,

     

       12
       12
       +
         libpq,

     

       12
       13
        
         libsodium,

     

       13
       14
        
         libtool,

     

       14
       14
       -
         postgresql,

     

       15
       15
        
         taler-exchange,

     

       16
       16
        
         taler-merchant,

     

       17
       17
        
         runtimeShell,

     
···

       41
       41
        
           jansson

     

       42
       42
        
           libgcrypt

     

       43
       43
        
           libmicrohttpd

     

       44
       44
       +
           libpq

     

       44
       45
        
           libsodium

     

       45
       46
        
           libtool

     

       46
       46
       -
           postgresql

     

       47
       47
        
           taler-exchange

     

       48
       48
        
           taler-merchant

     

       49
       49
        
         ];

+2 -2

pkgs/by-name/th/thc-hydra/package.nix

···

       9
       9
        
         pcre,

     

       10
       10
        
         libssh,

     

       11
       11
        
         libmysqlclient,

     

       12
       12
       -
         postgresql,

     

       12
       12
       +
         libpq,

     

       13
       13
        
         samba,

     

       14
       14
        
         withGUI ? false,

     

       15
       15
        
         makeWrapper,

     
···

       58
       58
        
           pcre

     

       59
       59
        
           libssh

     

       60
       60
        
           libmysqlclient

     

       61
       61
       -
           postgresql

     

       61
       61
       +
           libpq

     

       62
       62
        
           samba

     

       63
       63
        
         ] ++ lib.optional withGUI gtk2;

     

       64
       64

+2 -2

pkgs/by-name/tn/tntdb/package.nix

···

       4
       4
        
         fetchFromGitHub,

     

       5
       5
        
         autoreconfHook,

     

       6
       6
        
         cxxtools,

     

       7
       7
       -
         postgresql,

     

       7
       7
       +
         libpq,

     

       8
       8
        
         libmysqlclient,

     

       9
       9
        
         sqlite,

     

       10
       10
        
         zlib,

     
···

       28
       28
        
       

     

       29
       29
        
         buildInputs = [

     

       30
       30
        
           cxxtools

     

       31
       31
       -
           postgresql

     

       31
       31
       +
           libpq

     

       32
       32
        
           libmysqlclient

     

       33
       33
        
           sqlite

     

       34
       34
        
           zlib

+2 -2

pkgs/by-name/ul/ulogd/package.nix

···

       12
       12
        
         autoconf,

     

       13
       13
        
         autogen,

     

       14
       14
        
         libtool,

     

       15
       15
       -
         postgresql,

     

       15
       15
       +
         libpq,

     

       16
       16
        
         libmysqlclient,

     

       17
       17
        
         sqlite,

     

       18
       18
        
         pkg-config,

     
···

       61
       61
        
           libmnl

     

       62
       62
        
           libnfnetlink

     

       63
       63
        
           libpcap

     

       64
       64
       -
           postgresql

     

       64
       64
       +
           libpq

     

       65
       65
        
           libmysqlclient

     

       66
       66
        
           sqlite

     

       67
       67
        
         ];

+3 -3

pkgs/by-name/vi/virtualpg/package.nix

···

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchurl,

     

       5
       5
        
         validatePkgConfig,

     

       6
       6
       -
         postgresql,

     

       6
       6
       +
         libpq,

     

       7
       7
        
         sqlite,

     

       8
       8
        
         darwin,

     

       9
       9
        
       }:

     
···

       19
       19
        
       

     

       20
       20
        
         nativeBuildInputs = [

     

       21
       21
        
           validatePkgConfig

     

       22
       22
       -
           postgresql # for pg_config

     

       22
       22
       +
           libpq # for pg_config

     

       23
       23
        
         ];

     

       24
       24
        
       

     

       25
       25
        
         buildInputs = [

     

       26
       26
       -
           postgresql

     

       26
       26
       +
           libpq

     

       27
       27
        
           sqlite

     

       28
       28
        
         ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Kerberos ];

     

       29
       29

+2 -1

pkgs/by-name/za/zammad/package.nix

···

       10
       10
        
         procps,

     

       11
       11
        
         ruby,

     

       12
       12
        
         postgresql,

     

       13
       13
       +
         libpq,

     

       13
       14
        
         imlib2,

     

       14
       15
        
         jq,

     

       15
       16
        
         moreutils,

     
···

       59
       60
        
           ];

     

       60
       61
        
           gemConfig = defaultGemConfig // {

     

       61
       62
        
             pg = attrs: {

     

       62
       62
       -
               buildFlags = [ "--with-pg-config=${lib.getDev postgresql}/bin/pg_config" ];

     

       63
       63
       +
               buildInputs = [ libpq ];

     

       63
       64
        
             };

     

       64
       65
        
             rszr = attrs: {

     

       65
       66
        
               buildInputs = [

+2 -2

pkgs/development/ada-modules/gnatcoll/db.nix

···

       14
       14
        
       , gnatcoll-iconv

     

       15
       15
        
       , gnatcoll-readline

     

       16
       16
        
       , sqlite

     

       17
       17
       -
       , postgresql

     

       17
       17
       +
       , libpq

     

       18
       18
        
       }:

     

       19
       19
        
       

     

       20
       20
        
       let

     
···

       29
       29
        
           ];

     

       30
       30
        
           postgres = [

     

       31
       31
        
             gnatcoll-sql

     

       32
       32
       -
             postgresql

     

       32
       32
       +
             libpq

     

       33
       33
        
           ];

     

       34
       34
        
           sqlite = [

     

       35
       35
        
             gnatcoll-sql

+3 -3

pkgs/development/compilers/urweb/default.nix

···

       6
       6
        
         openssl,

     

       7
       7
        
         mlton,

     

       8
       8
        
         libmysqlclient,

     

       9
       9
       -
         postgresql,

     

       9
       9
       +
         libpq,

     

       10
       10
        
         sqlite,

     

       11
       11
        
         gcc,

     

       12
       12
        
         icu,

     
···

       25
       25
        
           openssl

     

       26
       26
        
           mlton

     

       27
       27
        
           libmysqlclient

     

       28
       28
       -
           postgresql

     

       28
       28
       +
           libpq

     

       29
       29
        
           sqlite

     

       30
       30
        
           icu

     

       31
       31
        
         ];

     
···

       45
       45
        
           export CCARGS="-I$out/include \

     

       46
       46
        
                          -L${lib.getLib openssl}/lib \

     

       47
       47
        
                          -L${libmysqlclient}/lib \

     

       48
       48
       -
                          -L${postgresql.lib}/lib \

     

       48
       48
       +
                          -L${libpq}/lib \

     

       49
       49
        
                          -L${sqlite.out}/lib";

     

       50
       50
        
         '';

     

       51
       51

+2 -2

pkgs/development/libraries/gdal/default.nix

···

       53
       53
        
         libjpeg,

     

       54
       54
        
         libjxl,

     

       55
       55
        
         libmysqlclient,

     

       56
       56
       +
         libpq,

     

       56
       57
        
         libpng,

     

       57
       58
        
         libspatialite,

     

       58
       59
        
         libtiff,

     
···

       66
       67
        
         pcre2,

     

       67
       68
        
         pkg-config,

     

       68
       69
        
         poppler,

     

       69
       69
       -
         postgresql,

     

       70
       70
        
         proj,

     

       71
       71
        
         python3,

     

       72
       72
        
         qhull,

     
···

       153
       153
        
               libhwy

     

       154
       154
        
             ];

     

       155
       155
        
             mysqlDeps = lib.optionals useMysql [ libmysqlclient ];

     

       156
       156
       -
             postgresDeps = lib.optionals usePostgres [ postgresql ];

     

       156
       156
       +
             postgresDeps = lib.optionals usePostgres [ libpq ];

     

       157
       157
        
             popplerDeps = lib.optionals usePoppler [ poppler ];

     

       158
       158
        
             arrowDeps = lib.optionals useArrow [ arrow-cpp ];

     

       159
       159
        
             hdfDeps = lib.optionals useHDF [

+2 -2

pkgs/development/libraries/kdb/default.nix

···

       8
       8
        
         kcoreaddons,

     

       9
       9
        
         python3,

     

       10
       10
        
         sqlite,

     

       11
       11
       -
         postgresql,

     

       11
       11
       +
         libpq,

     

       12
       12
        
         libmysqlclient,

     

       13
       13
        
         qttools,

     

       14
       14
        
       }:

     
···

       44
       44
        
           kcoreaddons

     

       45
       45
        
           python3

     

       46
       46
        
           sqlite

     

       47
       47
       -
           postgresql

     

       47
       47
       +
           libpq

     

       48
       48
        
           libmysqlclient

     

       49
       49
        
         ];

     

       50
       50

+3 -3

pkgs/development/libraries/libgda/6.x.nix

···

       24
       24
        
         mysqlSupport ? false,

     

       25
       25
        
         libmysqlclient ? null,

     

       26
       26
        
         postgresSupport ? false,

     

       27
       27
       -
         postgresql ? null,

     

       27
       27
       +
         libpq ? null,

     

       28
       28
        
       }:

     

       29
       29
        
       

     

       30
       30
        
       assert mysqlSupport -> libmysqlclient != null;

     

       31
       31
       -
       assert postgresSupport -> postgresql != null;

     

       31
       31
       +
       assert postgresSupport -> libpq != null;

     

       32
       32
        
       

     

       33
       33
        
       stdenv.mkDerivation rec {

     

       34
       34
        
         pname = "libgda";

     
···

       86
       86
        
             libmysqlclient

     

       87
       87
        
           ]

     

       88
       88
        
           ++ lib.optionals postgresSupport [

     

       89
       89
       -
             postgresql

     

       89
       89
       +
             libpq

     

       90
       90
        
           ];

     

       91
       91
        
       

     

       92
       92
        
         env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types";

+2 -2

pkgs/development/libraries/libgda/default.nix

···

       20
       20
        
         mysqlSupport ? false,

     

       21
       21
        
         libmysqlclient,

     

       22
       22
        
         postgresSupport ? false,

     

       23
       23
       -
         postgresql,

     

       23
       23
       +
         libpq,

     

       24
       24
        
       }:

     

       25
       25
        
       

     

       26
       26
        
       stdenv.mkDerivation rec {

     
···

       67
       67
        
             libmysqlclient

     

       68
       68
        
           ]

     

       69
       69
        
           ++ lib.optionals postgresSupport [

     

       70
       70
       -
             postgresql

     

       70
       70
       +
             libpq

     

       71
       71
        
           ];

     

       72
       72
        
       

     

       73
       73
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/libraries/librdf/redland.nix

···

       13
       13
        
         gmp,

     

       14
       14
        
         libmysqlclient,

     

       15
       15
        
         withMysql ? false,

     

       16
       16
       -
         postgresql,

     

       16
       16
       +
         libpq,

     

       17
       17
        
         withPostgresql ? false,

     

       18
       18
        
         sqlite,

     

       19
       19
        
         withSqlite ? true,

     
···

       46
       46
        
           ]

     

       47
       47
        
           ++ lib.optional withMysql libmysqlclient

     

       48
       48
        
           ++ lib.optional withSqlite sqlite

     

       49
       49
       -
           ++ lib.optional withPostgresql postgresql

     

       49
       49
       +
           ++ lib.optional withPostgresql libpq

     

       50
       50
        
           ++ lib.optional withBdb db;

     

       51
       51
        
       

     

       52
       52
        
         propagatedBuildInputs = [ librdf_rasqal ];

+2 -2

pkgs/development/libraries/mapnik/default.nix

···

       22
       22
        
         sqlite,

     

       23
       23
        
         zlib,

     

       24
       24
        
         catch2,

     

       25
       25
       -
         postgresql,

     

       25
       25
       +
         libpq,

     

       26
       26
        
         protozero,

     

       27
       27
        
         sparsehash,

     

       28
       28
        
       }:

     
···

       86
       86
        
           sqlite

     

       87
       87
        
           zlib

     

       88
       88
        
           libxml2

     

       89
       89
       -
           postgresql

     

       89
       89
       +
           libpq

     

       90
       90
        
           protozero

     

       91
       91
        
           sparsehash

     

       92
       92
        
         ];

+4 -4

pkgs/development/libraries/qt-5/modules/qtbase.nix

···

       53
       53
        
       

     

       54
       54
        
         # optional dependencies

     

       55
       55
        
         cups ? null,

     

       56
       56
       -
         postgresql ? null,

     

       56
       56
       +
         libpq ? null,

     

       57
       57
        
         withGtk3 ? false,

     

       58
       58
        
         dconf,

     

       59
       59
        
         gtk3,

     
···

       162
       162
        
               ++ lib.optional developerBuild gdb

     

       163
       163
        
               ++ lib.optional (cups != null) cups

     

       164
       164
        
               ++ lib.optional (mysqlSupport) libmysqlclient

     

       165
       165
       -
               ++ lib.optional (postgresql != null) postgresql;

     

       165
       165
       +
               ++ lib.optional (libpq != null) libpq;

     

       166
       166
        
       

     

       167
       167
        
             nativeBuildInputs =

     

       168
       168
        
               [

     
···

       360
       360
        
             # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag

     

       361
       361
        
             # if dependency paths contain the string "pq", which can occur in the hash.

     

       362
       362
        
             # To prevent these failures, we need to override PostgreSQL detection.

     

       363
       363
       -
             PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq";

     

       363
       363
       +
             PSQL_LIBS = lib.optionalString (libpq != null) "-L${libpq}/lib -lpq";

     

       364
       364
        
       

     

       365
       365
        
           }

     

       366
       366
        
           // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {

     
···

       453
       453
        
                 "${openssl.dev}/include"

     

       454
       454
        
                 "-system-sqlite"

     

       455
       455
        
                 ''-${if mysqlSupport then "plugin" else "no"}-sql-mysql''

     

       456
       456
       -
                 ''-${if postgresql != null then "plugin" else "no"}-sql-psql''

     

       456
       456
       +
                 ''-${if libpq != null then "plugin" else "no"}-sql-psql''

     

       457
       457
        
                 "-system-libpng"

     

       458
       458
        
       

     

       459
       459
        
                 "-make libs"

+2 -4

pkgs/development/libraries/qt-6/modules/qtbase/default.nix

···

       73
       73
        
         # optional dependencies

     

       74
       74
        
         cups,

     

       75
       75
        
         libmysqlclient,

     

       76
       76
       -
         postgresql,

     

       76
       76
       +
         libpq,

     

       77
       77
        
         withGtk3 ? false,

     

       78
       78
        
         gtk3,

     

       79
       79
        
         withLibinput ? false,

     
···

       176
       176
        
           ++ lib.optional withGtk3 gtk3

     

       177
       177
        
           ++ lib.optional withLibinput libinput

     

       178
       178
        
           ++ lib.optional (libmysqlclient != null && !stdenv.hostPlatform.isMinGW) libmysqlclient

     

       179
       179
       -
           ++ lib.optional (

     

       180
       180
       -
             postgresql != null && lib.meta.availableOn stdenv.hostPlatform postgresql

     

       181
       181
       -
           ) postgresql;

     

       179
       179
       +
           ++ lib.optional (libpq != null && lib.meta.availableOn stdenv.hostPlatform libpq) libpq;

     

       182
       180
        
       

     

       183
       181
        
         nativeBuildInputs = [

     

       184
       182
        
           bison

+2 -2

pkgs/development/libraries/soci/default.nix

···

       3
       3
        
         fetchFromGitHub,

     

       4
       4
        
         fetchpatch,

     

       5
       5
        
         sqlite,

     

       6
       6
       -
         postgresql,

     

       6
       6
       +
         libpq,

     

       7
       7
        
         boost,

     

       8
       8
        
         darwin,

     

       9
       9
        
         lib,

     
···

       42
       42
        
         buildInputs =

     

       43
       43
        
           [

     

       44
       44
        
             sqlite

     

       45
       45
       -
             postgresql

     

       45
       45
       +
             libpq

     

       46
       46
        
             boost

     

       47
       47
        
           ]

     

       48
       48
        
           ++ lib.optionals stdenv.hostPlatform.isDarwin [

+2 -2

pkgs/development/libraries/wt/default.nix

···

       1
       1
        
       { lib, stdenv, fetchFromGitHub, cmake, boost, pkg-config, doxygen, qtbase, libharu

     

       2
       2
       -
       , pango, fcgi, firebird, libmysqlclient, postgresql, graphicsmagick, glew, openssl

     

       2
       2
       +
       , pango, fcgi, firebird, libmysqlclient, libpq, graphicsmagick, glew, openssl

     

       3
       3
        
       , pcre, harfbuzz, icu

     

       4
       4
        
       }:

     

       5
       5
        
       

     
···

       20
       20
        
             nativeBuildInputs = [ cmake pkg-config ];

     

       21
       21
        
             buildInputs = [

     

       22
       22
        
               boost doxygen qtbase libharu

     

       23
       23
       -
               pango fcgi firebird libmysqlclient postgresql graphicsmagick glew

     

       23
       23
       +
               pango fcgi firebird libmysqlclient libpq graphicsmagick glew

     

       24
       24
        
               openssl pcre harfbuzz icu

     

       25
       25
        
             ];

     

       26
       26

+2 -2

pkgs/development/lua-modules/overrides.nix

···

       30
       30
        
       , libmpack

     

       31
       31
        
       , libmysqlclient

     

       32
       32
        
       , libpsl

     

       33
       33
       +
       , libpq

     

       33
       34
        
       , libuuid

     

       34
       35
        
       , libuv

     

       35
       36
        
       , libxcrypt

     
···

       44
       45
        
       , openssl

     

       45
       46
        
       , pcre

     

       46
       47
        
       , pkg-config

     

       47
       47
       -
       , postgresql

     

       48
       48
        
       , readline

     

       49
       49
        
       , rustPlatform

     

       50
       50
        
       , sol2

     
···

       361
       361
        
       

     

       362
       362
        
         luadbi-postgresql = prev.luadbi-postgresql.overrideAttrs (oa: {

     

       363
       363
        
           buildInputs = oa.buildInputs ++ [

     

       364
       364
       -
             (lib.getDev postgresql)

     

       364
       364
       +
             (lib.getDev libpq)

     

       365
       365
        
           ];

     

       366
       366
        
         });

     

       367
       367

+2 -3

pkgs/development/ocaml-modules/postgresql/default.nix

···

       1
       1
       -
       { lib, fetchFromGitHub, buildDunePackage, dune-configurator, postgresql }:

     

       1
       1
       +
       { lib, fetchFromGitHub, buildDunePackage, dune-configurator, libpq }:

     

       2
       2
        
       

     

       3
       3
        
       buildDunePackage rec {

     

       4
       4
        
         pname = "postgresql";

     
···

       15
       15
        
           sha256 = "1i4pnh2v00i0s7s9pcwz1x6s4xcd77d08gjjkvy0fmda6mqq6ghn";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         nativeBuildInputs = [ postgresql ];

     

       19
       18
        
         buildInputs = [ dune-configurator ];

     

       20
       20
       -
         propagatedBuildInputs = [ postgresql ];

     

       19
       19
       +
         propagatedBuildInputs = [ libpq ];

     

       21
       20
        
       

     

       22
       21
        
         meta = {

     

       23
       22
        
           description = "Bindings to the PostgreSQL library";

+2 -2

pkgs/development/octave-modules/database/default.nix

···

       3
       3
        
         lib,

     

       4
       4
        
         fetchurl,

     

       5
       5
        
         struct,

     

       6
       6
       -
         postgresql,

     

       6
       6
       +
         libpq,

     

       7
       7
        
       }:

     

       8
       8
        
       

     

       9
       9
        
       buildOctavePackage rec {

     
···

       20
       20
        
         ];

     

       21
       21
        
       

     

       22
       22
        
         propagatedBuildInputs = [

     

       23
       23
       -
           postgresql

     

       23
       23
       +
           libpq

     

       24
       24
        
         ];

     

       25
       25
        
       

     

       26
       26
        
         requiredOctavePackages = [

+2 -3

pkgs/development/python-modules/pgsanity/default.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         fetchPypi,

     

       4
       4
        
         buildPythonPackage,

     

       5
       5
       -
         postgresql,

     

       5
       5
       +
         libpq,

     

       6
       6
        
         unittestCheckHook,

     

       7
       7
        
       }:

     

       8
       8
        
       

     
···

       18
       18
        
       

     

       19
       19
        
         nativeCheckInputs = [

     

       20
       20
        
           unittestCheckHook

     

       21
       21
       -
           postgresql

     

       22
       21
        
         ];

     

       23
       22
        
       

     

       24
       23
        
         unittestFlagsArray = [ "test" ];

     

       25
       24
        
       

     

       26
       26
       -
         propagatedBuildInputs = [ postgresql ];

     

       25
       25
       +
         propagatedBuildInputs = [ libpq ];

     

       27
       26
        
       

     

       28
       27
        
         meta = with lib; {

     

       29
       28
        
           homepage = "https://github.com/markdrago/pgsanity";

+5 -4

pkgs/development/python-modules/psycopg/default.nix

···

       8
       8
        
         substituteAll,

     

       9
       9
        
       

     

       10
       10
        
         # build

     

       11
       11
       -
         postgresql,

     

       11
       11
       +
         libpq,

     

       12
       12
        
         setuptools,

     

       13
       13
        
       

     

       14
       14
        
         # propagates

     
···

       29
       29
        
         pproxy,

     

       30
       30
        
         pytest-randomly,

     

       31
       31
        
         pytestCheckHook,

     

       32
       32
       +
         postgresql,

     

       32
       33
        
         postgresqlTestHook,

     

       33
       34
        
       }:

     

       34
       35
        
       

     
···

       46
       47
        
         patches = [

     

       47
       48
        
           (substituteAll {

     

       48
       49
        
             src = ./ctypes.patch;

     

       49
       49
       -
             libpq = "${postgresql.lib}/lib/libpq${stdenv.hostPlatform.extensions.sharedLibrary}";

     

       50
       50
       +
             libpq = "${libpq}/lib/libpq${stdenv.hostPlatform.extensions.sharedLibrary}";

     

       50
       51
        
             libc = "${stdenv.cc.libc}/lib/libc.so.6";

     

       51
       52
        
           })

     

       52
       53
        
         ];

     
···

       74
       75
        
           nativeBuildInputs = [

     

       75
       76
        
             cython

     

       76
       77
        
             # needed to find pg_config with strictDeps

     

       77
       77
       -
             postgresql

     

       78
       78
       +
             libpq

     

       78
       79
        
             setuptools

     

       79
       80
        
             tomli

     

       80
       81
        
           ];

     

       81
       82
        
       

     

       82
       83
        
           buildInputs = [

     

       83
       83
       -
             postgresql

     

       84
       84
       +
             libpq

     

       84
       85
        
           ];

     

       85
       86
        
       

     

       86
       87
        
           # tested in psycopg

+3 -3

pkgs/development/ruby-modules/gem-config/default.nix

···

       18
       18
        
       # (to make gems behave if necessary).

     

       19
       19
        
       

     

       20
       20
        
       { lib, fetchurl, fetchpatch, fetchpatch2, writeScript, ruby, libkrb5, libxml2, libxslt, python2, stdenv, which

     

       21
       21
       -
       , libiconv, postgresql, nodejs, clang, sqlite, zlib, imagemagick, lasem

     

       21
       21
       +
       , libiconv, libpq, nodejs, clang, sqlite, zlib, imagemagick, lasem

     

       22
       22
        
       , pkg-config , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi

     

       23
       23
        
       , cmake, libssh2, openssl, openssl_1_1, libmysqlclient, git, perl, pcre2, gecode_3, curl

     

       24
       24
        
       , libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk3, lerc, buildRubyGem

     
···

       660
       660
        
           # an unnecessary reference to the entire postgresql package.

     

       661
       661
        
           buildFlags = [ "--with-pg-config=ignore" ];

     

       662
       662
        
           nativeBuildInputs = [ pkg-config ];

     

       663
       663
       -
           buildInputs = [ postgresql ];

     

       663
       663
       +
           buildInputs = [ libpq ];

     

       664
       664
        
         };

     

       665
       665
        
       

     

       666
       666
        
         psych = attrs: {

     
···

       813
       813
        
         };

     

       814
       814
        
       

     

       815
       815
        
         sequel_pg = attrs: {

     

       816
       816
       -
           buildInputs = [ postgresql ];

     

       816
       816
       +
           buildInputs = [ libpq ];

     

       817
       817
        
         };

     

       818
       818
        
       

     

       819
       819
        
         snappy = attrs: {

+2 -2

pkgs/games/ldmud/default.nix

···

       16
       16
        
       , mysqlSupport ? false

     

       17
       17
        
       , libmysqlclient

     

       18
       18
        
       , postgresSupport ? false

     

       19
       19
       -
       , postgresql

     

       19
       19
       +
       , libpq

     

       20
       20
        
       , sqliteSupport ? false

     

       21
       21
        
       , sqlite

     

       22
       22
        
       , tlsSupport ? false

     
···

       43
       43
        
           [ autoreconfHook pkg-config bison ];

     

       44
       44
        
         buildInputs = [ libgcrypt libxcrypt pcre json_c libxml2 ]

     

       45
       45
        
           ++ lib.optional mccpSupport zlib ++ lib.optional mysqlSupport libmysqlclient

     

       46
       46
       -
           ++ lib.optional postgresSupport postgresql

     

       46
       46
       +
           ++ lib.optional postgresSupport libpq

     

       47
       47
        
           ++ lib.optional sqliteSupport sqlite ++ lib.optional tlsSupport openssl

     

       48
       48
        
           ++ lib.optional pythonSupport python310

     

       49
       49
        
           ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];

+2 -2

pkgs/servers/http/openresty/default.nix

···

       4
       4
        
         lib,

     

       5
       5
        
         fetchurl,

     

       6
       6
        
         perl,

     

       7
       7
       -
         postgresql,

     

       7
       7
       +
         libpq,

     

       8
       8
        
         nixosTests,

     

       9
       9
        
         withPostgres ? true,

     

       10
       10
        
         ...

     
···

       36
       36
        
       

     

       37
       37
        
         nativeBuildInputs = [ perl ];

     

       38
       38
        
       

     

       39
       39
       -
         buildInputs = [ postgresql ];

     

       39
       39
       +
         buildInputs = [ libpq ];

     

       40
       40
        
       

     

       41
       41
        
         postPatch = ''

     

       42
       42
        
           patchShebangs configure bundle/

+2 -2

pkgs/servers/mail/dovecot/default.nix

···

       25
       25
        
         withMySQL ? false,

     

       26
       26
        
         libmysqlclient,

     

       27
       27
        
         withPgSQL ? false,

     

       28
       28
       -
         postgresql,

     

       28
       28
       +
         libpq,

     

       29
       29
        
         withSQLite ? true,

     

       30
       30
        
         sqlite,

     

       31
       31
        
         withLua ? false,

     
···

       60
       60
        
             inotify-tools

     

       61
       61
        
           ]

     

       62
       62
        
           ++ lib.optional withMySQL libmysqlclient

     

       63
       63
       -
           ++ lib.optional withPgSQL postgresql

     

       63
       63
       +
           ++ lib.optional withPgSQL libpq

     

       64
       64
        
           ++ lib.optional withSQLite sqlite

     

       65
       65
        
           ++ lib.optional withLua lua5_3;

     

       66
       66

+2 -2

pkgs/servers/mail/opensmtpd/extras.nix

···

       10
       10
        
         lua5,

     

       11
       11
        
         perl,

     

       12
       12
        
         libmysqlclient,

     

       13
       13
       -
         postgresql,

     

       13
       13
       +
         libpq,

     

       14
       14
        
         sqlite,

     

       15
       15
        
         hiredis,

     

       16
       16
        
         enableLua ? true,

     
···

       38
       38
        
           lua5

     

       39
       39
        
           perl

     

       40
       40
        
           libmysqlclient

     

       41
       41
       -
           postgresql

     

       41
       41
       +
           libpq

     

       42
       42
        
           sqlite

     

       43
       43
        
           hiredis

     

       44
       44
        
         ];

+2 -2

pkgs/servers/mail/postfix/default.nix

···

       21
       21
        
         withLDAP ? true,

     

       22
       22
        
         openldap,

     

       23
       23
        
         withPgSQL ? false,

     

       24
       24
       -
         postgresql,

     

       24
       24
       +
         libpq,

     

       25
       25
        
         withMySQL ? false,

     

       26
       26
        
         libmysqlclient,

     

       27
       27
        
         withSQLite ? false,

     
···

       87
       87
        
             libnsl

     

       88
       88
        
             pcre2

     

       89
       89
        
           ]

     

       90
       90
       -
           ++ lib.optional withPgSQL postgresql

     

       90
       90
       +
           ++ lib.optional withPgSQL libpq

     

       91
       91
        
           ++ lib.optional withMySQL libmysqlclient

     

       92
       92
        
           ++ lib.optional withSQLite sqlite

     

       93
       93
        
           ++ lib.optional withLDAP openldap;

+2 -2

pkgs/servers/monitoring/icinga2/default.nix

···

       11
       11
        
         openssl,

     

       12
       12
        
         patchelf,

     

       13
       13
        
         mariadb-connector-c,

     

       14
       14
       -
         postgresql,

     

       14
       14
       +
         libpq,

     

       15
       15
        
         zlib,

     

       16
       16
        
         tzdata,

     

       17
       17
        
         # Databases

     
···

       83
       83
        
           boost

     

       84
       84
        
           openssl

     

       85
       85
        
           systemd

     

       86
       86
       -
         ] ++ lib.optional withPostgresql postgresql;

     

       86
       86
       +
         ] ++ lib.optional withPostgresql libpq;

     

       87
       87
        
       

     

       88
       88
        
         nativeBuildInputs = [

     

       89
       89
        
           cmake

+2 -2

pkgs/servers/monitoring/zabbix/proxy.nix

···

       19
       19
        
         mysqlSupport ? false,

     

       20
       20
        
         libmysqlclient,

     

       21
       21
        
         postgresqlSupport ? false,

     

       22
       22
       -
         postgresql,

     

       22
       22
       +
         libpq,

     

       23
       23
        
       }:

     

       24
       24
        
       

     

       25
       25
        
       # ensure exactly one database type is selected

     
···

       55
       55
        
             ++ optional sqliteSupport sqlite

     

       56
       56
        
             ++ optional sshSupport libssh2

     

       57
       57
        
             ++ optional mysqlSupport libmysqlclient

     

       58
       58
       -
             ++ optional postgresqlSupport postgresql;

     

       58
       58
       +
             ++ optional postgresqlSupport libpq;

     

       59
       59
        
       

     

       60
       60
        
           configureFlags =

     

       61
       61
        
             [

+2 -2

pkgs/servers/monitoring/zabbix/server.nix

···

       24
       24
        
         mysqlSupport ? false,

     

       25
       25
        
         libmysqlclient,

     

       26
       26
        
         postgresqlSupport ? false,

     

       27
       27
       -
         postgresql,

     

       27
       27
       +
         libpq,

     

       28
       28
        
         ipmiSupport ? false,

     

       29
       29
        
         openipmi,

     

       30
       30
        
       }:

     
···

       67
       67
        
             ++ optional snmpSupport net-snmp

     

       68
       68
        
             ++ optional sshSupport libssh2

     

       69
       69
        
             ++ optional mysqlSupport libmysqlclient

     

       70
       70
       -
             ++ optional postgresqlSupport postgresql

     

       70
       70
       +
             ++ optional postgresqlSupport libpq

     

       71
       71
        
             ++ optional ipmiSupport openipmi;

     

       72
       72
        
       

     

       73
       73
        
           configureFlags =

+2 -2

pkgs/servers/mx-puppet-discord/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitLab, pkgs, lib, node-pre-gyp, nodejs_18, pkg-config

     

       2
       2
       -
       , libjpeg, pixman, cairo, pango, which, postgresql }:

     

       2
       2
       +
       , libjpeg, pixman, cairo, pango, which, libpq }:

     

       3
       3
        
       

     

       4
       4
        
       let

     

       5
       5
        
         nodejs = nodejs_18;

     
···

       23
       23
        
         inherit version src;

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [ node-pre-gyp nodejs.pkgs.node-gyp-build pkg-config which ];

     

       26
       26
       -
         buildInputs = [ libjpeg pixman cairo pango postgresql ];

     

       26
       26
       +
         buildInputs = [ libjpeg pixman cairo pango libpq ];

     

       27
       27
        
       

     

       28
       28
        
         postRebuild = ''

     

       29
       29
        
           # Build typescript stuff

+2 -2

pkgs/servers/nominatim/default.nix

···

       13
       13
        
         pandoc,

     

       14
       14
        
         nlohmann_json,

     

       15
       15
        
         # Nominatim needs to be built with the same postgres version it will target

     

       16
       16
       -
         postgresql,

     

       16
       16
       +
         libpq,

     

       17
       17
        
         python3,

     

       18
       18
        
         php,

     

       19
       19
        
         lua,

     
···

       70
       70
        
           # python3Packages.pylint  # We don't want to run pylint because the package could break on pylint bumps which is really annoying.

     

       71
       71
        
           # python3Packages.pytest  # disabled since I can't get it to run tests anyway

     

       72
       72
        
           # python3Packages.behave  # disabled since I can't get it to run tests anyway

     

       73
       73
       -
           postgresql

     

       73
       73
       +
           libpq

     

       74
       74
        
         ];

     

       75
       75
        
       

     

       76
       76
        
         postPatch = ''

+2 -2

pkgs/servers/sip/freeswitch/modules.nix

···

       8
       8
        
       , curl

     

       9
       9
        
       , ffmpeg

     

       10
       10
        
       , libmysqlclient

     

       11
       11
       -
       , postgresql

     

       11
       11
       +
       , libpq

     

       12
       12
        
       , spandsp3

     

       13
       13
        
       , sofia_sip

     

       14
       14
        
       , libks

     
···

       114
       114
        
       

     

       115
       115
        
         databases = {

     

       116
       116
        
           mariadb = mk "databases/mod_mariadb" [ libmysqlclient ];

     

       117
       117
       -
           pgsql = mk "databases/mod_pgsql" [ postgresql ];

     

       117
       117
       +
           pgsql = mk "databases/mod_pgsql" [ libpq ];

     

       118
       118
        
         };

     

       119
       119
        
       

     

       120
       120
        
         dialplans = {

+3 -1

pkgs/servers/sql/postgresql/default.nix

···

       30
       30
        
             )

     

       31
       31
        
           ) versions;

     

       32
       32
        
       

     

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

     

       34
       34
       +
       

     

       33
       35
        
       in

     

       34
       36
        
       # variations without and with JIT

     

       35
       35
       -
       (mkAttributes false) // (mkAttributes true)

     

       37
       37
       +
       (mkAttributes false) // (mkAttributes true) // { inherit libpq; }

+146

pkgs/servers/sql/postgresql/libpq.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         # utils

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         fetchurl,

     

       5
       5
       +
         lib,

     

       6
       6
       +
       

     

       7
       7
       +
         # runtime dependencies

     

       8
       8
       +
         openssl,

     

       9
       9
       +
         tzdata,

     

       10
       10
       +
         zlib,

     

       11
       11
       +
       

     

       12
       12
       +
         # build dependencies

     

       13
       13
       +
         bison,

     

       14
       14
       +
         flex,

     

       15
       15
       +
         perl,

     

       16
       16
       +
         pkg-config,

     

       17
       17
       +
       

     

       18
       18
       +
         # passthru / meta

     

       19
       19
       +
         postgresql,

     

       20
       20
       +
       

     

       21
       21
       +
         # GSSAPI

     

       22
       22
       +
         gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic,

     

       23
       23
       +
         libkrb5,

     

       24
       24
       +
       

     

       25
       25
       +
         # NLS

     

       26
       26
       +
         nlsSupport ? false,

     

       27
       27
       +
         gettext,

     

       28
       28
       +
       }:

     

       29
       29
       +
       

     

       30
       30
       +
       stdenv.mkDerivation (finalAttrs: {

     

       31
       31
       +
         pname = "libpq";

     

       32
       32
       +
         version = "17.2";

     

       33
       33
       +
       

     

       34
       34
       +
         src = fetchurl {

     

       35
       35
       +
           url = "mirror://postgresql/source/v${finalAttrs.version}/postgresql-${finalAttrs.version}.tar.bz2";

     

       36
       36
       +
           hash = "sha256-gu8nwK83UWldf2Ti2WNYMAX7tqDD32PQ5LQiEdcCEWQ=";

     

       37
       37
       +
         };

     

       38
       38
       +
       

     

       39
       39
       +
         __structuredAttrs = true;

     

       40
       40
       +
       

     

       41
       41
       +
         hardeningEnable = lib.optionals (!stdenv.cc.isClang) [ "pie" ];

     

       42
       42
       +
       

     

       43
       43
       +
         outputs = [

     

       44
       44
       +
           "out"

     

       45
       45
       +
           "dev"

     

       46
       46
       +
         ];

     

       47
       47
       +
         outputChecks.out = {

     

       48
       48
       +
           disallowedReferences = [ "dev" ];

     

       49
       49
       +
           disallowedRequisites = [

     

       50
       50
       +
             stdenv.cc

     

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

     

       52
       52
       +
         };

     

       53
       53
       +
       

     

       54
       54
       +
         buildInputs =

     

       55
       55
       +
           [

     

       56
       56
       +
             zlib

     

       57
       57
       +
             openssl

     

       58
       58
       +
           ]

     

       59
       59
       +
           ++ lib.optionals gssSupport [ libkrb5 ]

     

       60
       60
       +
           ++ lib.optionals nlsSupport [ gettext ];

     

       61
       61
       +
       

     

       62
       62
       +
         nativeBuildInputs = [

     

       63
       63
       +
           bison

     

       64
       64
       +
           flex

     

       65
       65
       +
           perl

     

       66
       66
       +
           pkg-config

     

       67
       67
       +
         ];

     

       68
       68
       +
       

     

       69
       69
       +
         # causes random build failures

     

       70
       70
       +
         enableParallelBuilding = false;

     

       71
       71
       +
       

     

       72
       72
       +
         separateDebugInfo = true;

     

       73
       73
       +
       

     

       74
       74
       +
         buildFlags = [

     

       75
       75
       +
           "submake-libpgport"

     

       76
       76
       +
           "submake-libpq"

     

       77
       77
       +
         ];

     

       78
       78
       +
       

     

       79
       79
       +
         # libpgcommon.a and libpgport.a contain all paths normally returned by pg_config and are

     

       80
       80
       +
         # linked into all shared libraries. However, almost no binaries actually use those paths.

     

       81
       81
       +
         # The following flags will remove unused sections from all shared libraries - including

     

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

     

       83
       83
       +
         # and allows splitting them cleanly.

     

       84
       84
       +
         env.CFLAGS =

     

       85
       85
       +
           "-fdata-sections -ffunction-sections"

     

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

     

       87
       87
       +
       

     

       88
       88
       +
         configureFlags =

     

       89
       89
       +
           [

     

       90
       90
       +
             "--enable-debug"

     

       91
       91
       +
             "--sysconfdir=/etc"

     

       92
       92
       +
             "--with-openssl"

     

       93
       93
       +
             "--with-system-tzdata=${tzdata}/share/zoneinfo"

     

       94
       94
       +
             "--without-icu"

     

       95
       95
       +
             "--without-perl"

     

       96
       96
       +
             "--without-readline"

     

       97
       97
       +
           ]

     

       98
       98
       +
           ++ lib.optionals gssSupport [ "--with-gssapi" ]

     

       99
       99
       +
           ++ lib.optionals nlsSupport [ "--enable-nls" ];

     

       100
       100
       +
       

     

       101
       101
       +
         patches = lib.optionals stdenv.hostPlatform.isLinux [

     

       102
       102
       +
           ./patches/socketdir-in-run-13+.patch

     

       103
       103
       +
         ];

     

       104
       104
       +
       

     

       105
       105
       +
         installPhase = ''

     

       106
       106
       +
           runHook preInstall

     

       107
       107
       +
       

     

       108
       108
       +
           make -C src/bin/pg_config install

     

       109
       109
       +
           make -C src/common install

     

       110
       110
       +
           make -C src/include install

     

       111
       111
       +
           make -C src/interfaces/libpq install

     

       112
       112
       +
           make -C src/port install

     

       113
       113
       +
       

     

       114
       114
       +
           moveToOutput bin/pg_config "$dev"

     

       115
       115
       +
           moveToOutput "lib/*.a" "$dev"

     

       116
       116
       +
       

     

       117
       117
       +
           rm -rfv $out/share

     

       118
       118
       +
           rm -rfv $dev/lib/*_shlib.a

     

       119
       119
       +
       

     

       120
       120
       +
           runHook postInstall

     

       121
       121
       +
         '';

     

       122
       122
       +
       

     

       123
       123
       +
         # PostgreSQL always builds both shared and static libs, so we delete those we don't want.

     

       124
       124
       +
         postInstall =

     

       125
       125
       +
           if stdenv.hostPlatform.isStatic then

     

       126
       126
       +
             ''

     

       127
       127
       +
               rm -rfv $out/lib/*.so*

     

       128
       128
       +
               touch $out/empty

     

       129
       129
       +
             ''

     

       130
       130
       +
           else

     

       131
       131
       +
             "rm -rfv $dev/lib/*.a";

     

       132
       132
       +
       

     

       133
       133
       +
         doCheck = false;

     

       134
       134
       +
       

     

       135
       135
       +
         meta = {

     

       136
       136
       +
           inherit (postgresql.meta)

     

       137
       137
       +
             homepage

     

       138
       138
       +
             license

     

       139
       139
       +
             maintainers

     

       140
       140
       +
             platforms

     

       141
       141
       +
             ;

     

       142
       142
       +
           description = "C application programmer's interface to PostgreSQL";

     

       143
       143
       +
           changelog = "https://www.postgresql.org/docs/release/${finalAttrs.version}/";

     

       144
       144
       +
           pkgConfigModules = [ "libpq" ];

     

       145
       145
       +
         };

     

       146
       146
       +
       })

+2 -2

pkgs/servers/web-apps/lemmy/server.nix

···

       4
       4
        
         rustPlatform,

     

       5
       5
        
         fetchFromGitHub,

     

       6
       6
        
         openssl,

     

       7
       7
       -
         postgresql,

     

       7
       7
       +
         libpq,

     

       8
       8
        
         libiconv,

     

       9
       9
        
         Security,

     

       10
       10
        
         SystemConfiguration,

     
···

       35
       35
        
         cargoHash = pinData.serverCargoHash;

     

       36
       36
        
       

     

       37
       37
        
         buildInputs =

     

       38
       38
       -
           [ postgresql ]

     

       38
       38
       +
           [ libpq ]

     

       39
       39
        
           ++ lib.optionals stdenv.hostPlatform.isDarwin [

     

       40
       40
        
             libiconv

     

       41
       41
        
             Security

+3 -3

pkgs/tools/backup/bacula/default.nix

···

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchurl,

     

       5
       5
        
         sqlite,

     

       6
       6
       -
         postgresql,

     

       6
       6
       +
         libpq,

     

       7
       7
        
         zlib,

     

       8
       8
        
         acl,

     

       9
       9
        
         ncurses,

     
···

       32
       32
        
       

     

       33
       33
        
         buildInputs =

     

       34
       34
        
           [

     

       35
       35
       -
             postgresql

     

       35
       35
       +
             libpq

     

       36
       36
        
             sqlite

     

       37
       37
        
             zlib

     

       38
       38
        
             ncurses

     
···

       51
       51
        
         configureFlags =

     

       52
       52
        
           [

     

       53
       53
        
             "--with-sqlite3=${sqlite.dev}"

     

       54
       54
       -
             "--with-postgresql=${lib.getDev postgresql}"

     

       54
       54
       +
             "--with-postgresql=${lib.getDev libpq}"

     

       55
       55
        
             "--with-logdir=/var/log/bacula"

     

       56
       56
        
             "--with-working-dir=/var/lib/bacula"

     

       57
       57
        
             "--mandir=\${out}/share/man"

+3 -3

pkgs/tools/package-management/disnix/dysnomia/default.nix

···

       8
       8
        
         systemd ? null,

     

       9
       9
        
         ejabberd ? null,

     

       10
       10
        
         mariadb ? null,

     

       11
       11
       -
         postgresql ? null,

     

       11
       11
       +
         libpq ? null,

     

       12
       12
        
         subversion ? null,

     

       13
       13
        
         mongodb ? null,

     

       14
       14
        
         mongodb-tools ? null,

     
···

       41
       41
        
       }:

     

       42
       42
        
       

     

       43
       43
        
       assert enableMySQLDatabase -> mariadb != null;

     

       44
       44
       -
       assert enablePostgreSQLDatabase -> postgresql != null;

     

       44
       44
       +
       assert enablePostgreSQLDatabase -> libpq != null;

     

       45
       45
        
       assert enableSubversionRepository -> subversion != null;

     

       46
       46
        
       assert enableEjabberdDump -> ejabberd != null;

     

       47
       47
        
       assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null);

     
···

       87
       87
        
           ++ lib.optional stdenv.hostPlatform.isLinux systemd

     

       88
       88
        
           ++ lib.optional enableEjabberdDump ejabberd

     

       89
       89
        
           ++ lib.optional enableMySQLDatabase mariadb.out

     

       90
       90
       -
           ++ lib.optional enablePostgreSQLDatabase postgresql

     

       90
       90
       +
           ++ lib.optional enablePostgreSQLDatabase libpq

     

       91
       91
        
           ++ lib.optional enableSubversionRepository subversion

     

       92
       92
        
           ++ lib.optionals enableMongoDatabase [

     

       93
       93
        
             mongodb

+2 -2

pkgs/tools/security/vaultwarden/default.nix

···

       13
       13
        
         SystemConfiguration,

     

       14
       14
        
         dbBackend ? "sqlite",

     

       15
       15
        
         libmysqlclient,

     

       16
       16
       -
         postgresql,

     

       16
       16
       +
         libpq,

     

       17
       17
        
       }:

     

       18
       18
        
       

     

       19
       19
        
       let

     
···

       47
       47
        
             SystemConfiguration

     

       48
       48
        
           ]

     

       49
       49
        
           ++ lib.optional (dbBackend == "mysql") libmysqlclient

     

       50
       50
       -
           ++ lib.optional (dbBackend == "postgresql") postgresql;

     

       50
       50
       +
           ++ lib.optional (dbBackend == "postgresql") libpq;

     

       51
       51
        
       

     

       52
       52
        
         buildFeatures = dbBackend;

     

       53
       53

+2 -2

pkgs/tools/system/collectd/plugins.nix

···

       19
       19
        
         gdk-pixbuf,

     

       20
       20
        
         liboping,

     

       21
       21
        
         libpcap,

     

       22
       22
       +
         libpq,

     

       22
       23
        
         libsigrok,

     

       23
       24
        
         libvirt,

     

       24
       25
        
         libxml2,

     
···

       31
       32
        
         openldap,

     

       32
       33
        
         openipmi,

     

       33
       34
        
         perl,

     

       34
       34
       -
         postgresql,

     

       35
       35
        
         protobufc,

     

       36
       36
        
         python3,

     

       37
       37
        
         rabbitmq-c,

     
···

       132
       132
        
           perl.buildInputs = [ perl ];

     

       133
       133
        
           pinba.buildInputs = [ protobufc ];

     

       134
       134
        
           ping.buildInputs = [ liboping ];

     

       135
       135
       -
           postgresql.buildInputs = [ postgresql ];

     

       135
       135
       +
           postgresql.buildInputs = [ libpq ];

     

       136
       136
        
           python.buildInputs = [ python3 ];

     

       137
       137
        
           redis.buildInputs = [ hiredis ];

     

       138
       138
        
           rrdcached.buildInputs = [

+2 -2

pkgs/tools/system/rsyslog/default.nix

···

       18
       18
        
         withMysql ? true,

     

       19
       19
        
         libmysqlclient,

     

       20
       20
        
         withPostgres ? true,

     

       21
       21
       -
         postgresql,

     

       21
       21
       +
         libpq,

     

       22
       22
        
         withDbi ? true,

     

       23
       23
        
         libdbi,

     

       24
       24
        
         withNetSnmp ? true,

     
···

       84
       84
        
           ]

     

       85
       85
        
           ++ lib.optional withKrb5 libkrb5

     

       86
       86
        
           ++ lib.optional withJemalloc jemalloc

     

       87
       87
       -
           ++ lib.optional withPostgres postgresql

     

       87
       87
       +
           ++ lib.optional withPostgres libpq

     

       88
       88
        
           ++ lib.optional withDbi libdbi

     

       89
       89
        
           ++ lib.optional withNetSnmp net-snmp

     

       90
       90
        
           ++ lib.optional withUuid libuuid

+2 -2

pkgs/tools/text/gawk/gawkextlib.nix

···

       20
       20
        
         glibcLocales,

     

       21
       21
        
         mpfr,

     

       22
       22
        
         more,

     

       23
       23
       -
         postgresql,

     

       23
       23
       +
         libpq,

     

       24
       24
        
         hiredis,

     

       25
       25
        
         expat,

     

       26
       26
        
         tre,

     
···

       165
       165
        
           pgsql = buildExtension {

     

       166
       166
        
             inherit gawkextlib;

     

       167
       167
        
             name = "pgsql";

     

       168
       168
       -
             extraBuildInputs = [ postgresql ];

     

       168
       168
       +
             extraBuildInputs = [ libpq ];

     

       169
       169
        
           };

     

       170
       170
        
           redis = buildExtension {

     

       171
       171
        
             inherit gawkextlib;

+3 -3

pkgs/top-level/all-packages.nix

···

       1039
       1039
        
           systemd = pkgs.systemd;

     

       1040
       1040
        
         };

     

       1041
       1041
        
       

     

       1042
       1042
       -
         nominatim = callPackage ../servers/nominatim {

     

       1043
       1043
       -
           postgresql = postgresql_14;

     

       1044
       1044
       -
         };

     

       1042
       1042
       +
         nominatim = callPackage ../servers/nominatim { };

     

       1045
       1043
        
       

     

       1046
       1044
        
         ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { };

     

       1047
       1045
        
       

     
···

       11685
       11683
        
       

     

       11686
       11684
        
         postgresqlVersions = import ../servers/sql/postgresql pkgs;

     

       11687
       11685
        
         inherit (postgresqlVersions)

     

       11686
       11686
       +
           libpq

     

       11687
       11687
       +
       

     

       11688
       11688
        
           postgresql_13

     

       11689
       11689
        
           postgresql_14

     

       11690
       11690
        
           postgresql_15

+1 -1

pkgs/top-level/ocaml-packages.nix

···

       1540
       1540
        
           posix-types = callPackage ../development/ocaml-modules/posix/types.nix { };

     

       1541
       1541
        
       

     

       1542
       1542
        
           postgresql = callPackage ../development/ocaml-modules/postgresql {

     

       1543
       1543
       -
             inherit (pkgs) postgresql;

     

       1543
       1543
       +
             inherit (pkgs) libpq;

     

       1544
       1544
        
           };

     

       1545
       1545
        
       

     

       1546
       1546
        
           pp = callPackage ../development/ocaml-modules/pp { };

+8 -5

pkgs/top-level/php-packages.nix

···

       20
       20
        
         libffi,

     

       21
       21
        
         libiconv,

     

       22
       22
        
         libkrb5,

     

       23
       23
       +
         libpq,

     

       23
       24
        
         libsodium,

     

       24
       25
        
         libxml2,

     

       25
       26
        
         libxslt,

     
···

       33
       34
        
         overrideSDK,

     

       34
       35
        
         pam,

     

       35
       36
        
         pcre2,

     

       36
       36
       -
         postgresql,

     

       37
       37
        
         bison,

     

       38
       38
        
         re2c,

     

       39
       39
        
         readline,

     
···

       351
       351
        
                 configureFlags = [ "--with-pdo-oci=instantclient,${pkgs.oracle-instantclient.lib}/lib" ];

     

       352
       352
        
       

     

       353
       353
        
                 internalDeps = [ php.extensions.pdo ];

     

       354
       354
       -
       

     

       355
       354
        
                 postPatch = ''

     

       356
       355
        
                   sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4

     

       357
       356
        
                 '';

     
···

       635
       634
        
                     {

     

       636
       635
        
                       name = "pdo_pgsql";

     

       637
       636
        
                       internalDeps = [ php.extensions.pdo ];

     

       638
       638
       -
                       configureFlags = [ "--with-pdo-pgsql=${lib.getDev postgresql}" ];

     

       637
       637
       +
                       buildInputs = [ libpq ];

     

       638
       638
       +
                       configureFlags = [ "--with-pdo-pgsql=${lib.getDev libpq}" ];

     

       639
       639
        
                       doCheck = false;

     

       640
       640
        
                     }

     

       641
       641
        
                     {

     
···

       647
       647
        
                     }

     

       648
       648
        
                     {

     

       649
       649
        
                       name = "pgsql";

     

       650
       650
       -
                       buildInputs = [ pcre2 ];

     

       651
       651
       -
                       configureFlags = [ "--with-pgsql=${lib.getDev postgresql}" ];

     

       650
       650
       +
                       buildInputs = [

     

       651
       651
       +
                         pcre2

     

       652
       652
       +
                         libpq

     

       653
       653
       +
                       ];

     

       654
       654
       +
                       configureFlags = [ "--with-pgsql=${lib.getDev libpq}" ];

     

       652
       655
        
                       doCheck = false;

     

       653
       656
        
                     }

     

       654
       657
        
                     {