···

       
210
       
210
       
 
       
  poke = addPackageRequires super.poke [ self.poke-mode ];

     

       
211
       
211
       
 
       


     

       
212
       
212
       
 
       
  pq = super.pq.overrideAttrs (old: {

     

       
213
       
213
       
-
       
    buildInputs = old.buildInputs or [ ] ++ [ pkgs.postgresql ];

     

       
213
       
213
       
+
       
    buildInputs = old.buildInputs or [ ] ++ [ pkgs.libpq ];

     

       
214
       
214
       
 
       
  });

     

       
215
       
215
       
 
       


     

       
216
       
216
       
 
       
  preview-auto = mkHome super.preview-auto;

     

···

       
14
       
14
       
 
       
  withIDN ? true,

     

       
15
       
15
       
 
       
  libidn,

     

       
16
       
16
       
 
       
  withPostgreSQL ? false,

     

       
17
       
17
       
-
       
  postgresql,

     

       
17
       
17
       
+
       
  libpq,

     

       
18
       
18
       
 
       
  withSQLite ? true,

     

       
19
       
19
       
 
       
  sqlite,

     

       
20
       
20
       
 
       
  withUDNS ? true,

     
···

       
57
       
57
       
 
       
      botan2

     

       
58
       
58
       
 
       
    ]

     

       
59
       
59
       
 
       
    ++ lib.optional withIDN libidn

     

       
60
       
60
       
-
       
    ++ lib.optional withPostgreSQL postgresql

     

       
60
       
60
       
+
       
    ++ lib.optional withPostgreSQL libpq

     

       
61
       
61
       
 
       
    ++ lib.optional withSQLite sqlite

     

       
62
       
62
       
 
       
    ++ lib.optional withUDNS udns;

     

       
63
       
63
       
 
       


     

···

       
15
       
15
       
 
       
  libmysqlclient,

     

       
16
       
16
       
 
       
  log4cplus,

     

       
17
       
17
       
 
       
  openssl,

     

       
18
       
18
       
-
       
  postgresql,

     

       
18
       
18
       
+
       
  libpq,

     

       
19
       
19
       
 
       
  python3,

     

       
20
       
20
       
 
       


     

       
21
       
21
       
 
       
  # tests

     
···

       
54
       
54
       
 
       
      "--localstatedir=/var"

     

       
55
       
55
       
 
       
      "--with-openssl=${lib.getDev openssl}"

     

       
56
       
56
       
 
       
    ]

     

       
57
       
57
       
-
       
    ++ lib.optional withPostgres "--with-pgsql=${lib.getDev postgresql}/bin/pg_config"

     

       
57
       
57
       
+
       
    ++ lib.optional withPostgres "--with-pgsql=${lib.getDev libpq}/bin/pg_config"

     

       
58
       
58
       
 
       
    ++ lib.optional withMysql "--with-mysql=${lib.getDev libmysqlclient}/bin/mysql_config";

     

       
59
       
59
       
 
       


     

       
60
       
60
       
 
       
  postConfigure = ''

     

···

       
4
       
4
       
 
       
  lib,

     

       
5
       
5
       
 
       
  libbsd,

     

       
6
       
6
       
 
       
  ncurses,

     

       
7
       
7
       
-
       
  postgresql,

     

       
7
       
7
       
+
       
  libpq,

     

       
8
       
8
       
 
       
  stdenv,

     

       
9
       
9
       
 
       
}:

     

       
10
       
10
       
 
       


     
···

       
19
       
19
       
 
       


     

       
20
       
20
       
 
       
  buildInputs = [

     

       
21
       
21
       
 
       
    libbsd

     

       
22
       
22
       
+
       
    libpq

     

       
22
       
23
       
 
       
    ncurses

     

       
23
       
23
       
-
       
    postgresql

     

       
24
       
24
       
 
       
  ];

     

       
25
       
25
       
 
       


     

       
26
       
26
       
 
       
  nativeBuildInputs = [ cmake ];

     

···

       
146
       
146
       
 
       
  );

     

       
147
       
147
       
 
       
  openssl = addToBuildInputs pkgs.openssl;

     

       
148
       
148
       
 
       
  plot = addToBuildInputs pkgs.plotutils;

     

       
149
       
149
       
-
       
  postgresql = addToBuildInputsWithPkgConfig pkgs.postgresql;

     

       
149
       
149
       
+
       
  postgresql = addToBuildInputsWithPkgConfig pkgs.libpq;

     

       
150
       
150
       
 
       
  rocksdb = addToBuildInputs pkgs.rocksdb_8_3;

     

       
151
       
151
       
 
       
  scheme2c-compatibility = addPkgConfig;

     

       
152
       
152
       
 
       
  sdl-base =

     

···

       
59
       
59
       
 
       
      nativeLibs = [ pkgs.mariadb.client ];

     

       
60
       
60
       
 
       
    });

     

       
61
       
61
       
 
       
    clsql-postgresql = super.clsql-postgresql.overrideLispAttrs (o: {

     

       
62
       
62
       
-
       
      nativeLibs = [ pkgs.postgresql.lib ];

     

       
62
       
62
       
+
       
      nativeLibs = [ pkgs.libpq ];

     

       
63
       
63
       
 
       
    });

     

       
64
       
64
       
 
       
    clsql-sqlite3 = super.clsql-sqlite3.overrideLispAttrs (o: {

     

       
65
       
65
       
 
       
      nativeLibs = [ pkgs.sqlite ];

     

···

       
335
       
335
       
 
       
  };

     

       
336
       
336
       
 
       


     

       
337
       
337
       
 
       
  packagesWithNativeBuildInputs = {

     

       
338
       
338
       
-
       
    adbcpostgresql = [ pkgs.postgresql ];

     

       
339
       
338
       
 
       
    adimpro = [ pkgs.imagemagick ];

     

       
340
       
339
       
 
       
    animation = [ pkgs.which ];

     

       
341
       
340
       
 
       
    Apollonius = with pkgs; [ pkg-config gmp.dev mpfr.dev ];

     
···

       
484
       
483
       
 
       
    RODBC = [ pkgs.libiodbc ];

     

       
485
       
484
       
 
       
    rpanel = [ pkgs.tclPackages.bwidget ];

     

       
486
       
485
       
 
       
    Rpoppler = [ pkgs.poppler ];

     

       
487
       
487
       
-
       
    RPostgres = with pkgs; [ postgresql ];

     

       
488
       
488
       
-
       
    RPostgreSQL = with pkgs; [ postgresql postgresql ];

     

       
486
       
486
       
+
       
    RPostgreSQL = with pkgs; [ libpq ];

     

       
489
       
487
       
 
       
    RProtoBuf = [ pkgs.protobuf ];

     

       
490
       
488
       
 
       
    RSclient = [ pkgs.openssl.dev ];

     

       
491
       
489
       
 
       
    Rserve = [ pkgs.openssl ];

     
···

       
614
       
612
       
 
       


     

       
615
       
613
       
 
       
  packagesWithBuildInputs = {

     

       
616
       
614
       
 
       
    # sort -t '=' -k 2

     

       
617
       
617
       
-
       
    adbcpostgresql = with pkgs; [ readline.dev zlib.dev openssl.dev libkrb5.dev openpam ];

     

       
615
       
615
       
+
       
    adbcpostgresql = with pkgs; [ readline.dev zlib.dev openssl.dev libkrb5.dev openpam libpq ];

     

       
618
       
616
       
 
       
    asciicast = with pkgs; [ xz.dev bzip2.dev zlib.dev icu.dev libdeflate ];

     

       
619
       
617
       
 
       
    island = [ pkgs.gsl.dev ];

     

       
620
       
618
       
 
       
    svKomodo = [ pkgs.which ];

     
···

       
646
       
644
       
 
       
    RGtk2 = [ pkgs.pkg-config ];

     

       
647
       
645
       
 
       
    RProtoBuf = [ pkgs.pkg-config ];

     

       
648
       
646
       
 
       
    Rpoppler = [ pkgs.pkg-config ];

     

       
647
       
647
       
+
       
    RPostgres = with pkgs; [ libpq ];

     

       
649
       
648
       
 
       
    XML = [ pkgs.pkg-config ];

     

       
650
       
649
       
 
       
    apsimx = [ pkgs.which ];

     

       
651
       
650
       
 
       
    cairoDevice = [ pkgs.pkg-config ];

     
···

       
1623
       
1622
       
 
       


     

       
1624
       
1623
       
 
       
      # consumes a lot of resources in parallel

     

       
1625
       
1624
       
 
       
      enableParallelBuilding = false;

     

       
1626
       
1626
       
-
       
    });

     

       
1627
       
1627
       
-
       


     

       
1628
       
1628
       
-
       
    RPostgres = old.RPostgres.overrideAttrs (attrs: {

     

       
1629
       
1629
       
-
       
      preConfigure = ''

     

       
1630
       
1630
       
-
       
        export INCLUDE_DIR=${pkgs.postgresql}/include

     

       
1631
       
1631
       
-
       
        export LIB_DIR=${pkgs.postgresql.lib}/lib

     

       
1632
       
1632
       
-
       
        patchShebangs configure

     

       
1633
       
1633
       
-
       
        '';

     

       
1634
       
1625
       
 
       
    });

     

       
1635
       
1626
       
 
       


     

       
1636
       
1627
       
 
       
    OpenMx = old.OpenMx.overrideAttrs (attrs: {

     

···

       
42
       
42
       
 
       
    loki

     

       
43
       
43
       
 
       
    libmysqlclient

     

       
44
       
44
       
 
       
    openssl

     

       
45
       
45
       
-
       
    postgresql

     

       
45
       
45
       
+
       
    postgresql # needs libecpg, which is not available in libpq package

     

       
46
       
46
       
 
       
    qscintilla

     

       
47
       
47
       
 
       
    qtbase

     

       
48
       
48
       
 
       
  ];

     

···

       
7
       
7
       
 
       
  shared-mime-info,

     

       
8
       
8
       
 
       
  xz,

     

       
9
       
9
       
 
       
  mariadb,

     

       
10
       
10
       
-
       
  postgresql,

     

       
10
       
10
       
+
       
  libpq,

     

       
11
       
11
       
 
       
  sqlite,

     

       
12
       
12
       
 
       
  backend ? "mysql",

     

       
13
       
13
       
 
       
}:

     
···

       
32
       
32
       
 
       
      "-DMYSQLD_SCRIPTS_PATH=${lib.getBin mariadb}/bin"

     

       
33
       
33
       
 
       
    ]

     

       
34
       
34
       
 
       
    ++ lib.optionals (backend == "postgres") [

     

       
35
       
35
       
-
       
      "-DPOSTGRES_PATH=${lib.getBin postgresql}/bin"

     

       
35
       
35
       
+
       
      "-DPOSTGRES_PATH=${lib.getBin libpq}/bin"

     

       
36
       
36
       
 
       
    ];

     

       
37
       
37
       
 
       


     

       
38
       
38
       
 
       
  extraNativeBuildInputs = [

     
···

       
47
       
47
       
 
       
      xz

     

       
48
       
48
       
 
       
    ]

     

       
49
       
49
       
 
       
    ++ lib.optionals (backend == "mysql") [ mariadb ]

     

       
50
       
50
       
-
       
    ++ lib.optionals (backend == "postgres") [ postgresql ]

     

       
50
       
50
       
+
       
    ++ lib.optionals (backend == "postgres") [ libpq ]

     

       
51
       
51
       
 
       
    ++ lib.optionals (backend == "sqlite") [ sqlite ];

     

       
52
       
52
       
 
       


     

       
53
       
53
       
 
       
  # Hardcoded as a QString, which is UTF-16 so Nix can't pick it up automatically

     
···

       
60
       
60
       
 
       
      echo "${mariadb}" > $out/nix-support/depends

     

       
61
       
61
       
 
       
    ''

     

       
62
       
62
       
 
       
    + lib.optionalString (backend == "postgres") ''

     

       
63
       
63
       
-
       
      echo "${postgresql}" > $out/nix-support/depends

     

       
63
       
63
       
+
       
      echo "${libpq}" > $out/nix-support/depends

     

       
64
       
64
       
 
       
    '';

     

       
65
       
65
       
 
       
}