libpq: init at 17.2

Resolves NixOS#61580
wolfgangwalther · Dec 14, 2024 · bb88f6d · bb88f6d
1 parent 3439d29
commit bb88f6d
Show file tree

Hide file tree

Showing 95 changed files with 367 additions and 228 deletions.
diff --git a/pkgs/applications/blockchains/lighthouse/default.nix b/pkgs/applications/blockchains/lighthouse/default.nix
@@ -7,7 +7,7 @@
 , nix-update-script
 , openssl
 , pkg-config
-, postgresql
+, libpq
 , protobuf
 , rustPlatform
 , rust-jemalloc-sys
@@ -130,7 +130,7 @@ rustPlatform.buildRustPackage rec {
   ];
 
   nativeCheckInputs = [
-    postgresql
+    libpq
   ];
 
   passthru = {

diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
@@ -26,7 +26,7 @@
 , llvmPackages
 , yaml-cpp
 , soci
-, postgresql
+, libpq
 , nodejs
 , qmake
 , server ? false # build server version
@@ -98,7 +98,7 @@ in
       libuuid
       yaml-cpp
       soci
-      postgresql
+      libpq
       quarto
     ] ++ (if server then [
       sqlite.dev

diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix
@@ -27,7 +27,7 @@
 , netcdf
 , pdal
 , pkg-config
-, postgresql
+, libpq
 , proj
 , python3Packages
 , readline
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxml2
     netcdf
     pdal
-    postgresql
+    libpq
     proj
     readline
     sqlite
@@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
     "--with-openmp"
     "--with-pdal"
     "--with-postgres"
-    "--with-postgres-libs=${postgresql.lib}/lib/"
+    "--with-postgres-libs=${libpq}/lib/"
     "--with-proj-includes=${proj.dev}/include"
     "--with-proj-libs=${proj}/lib"
     "--with-proj-share=${proj}/share/proj"

diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
@@ -21,14 +21,14 @@
   grass,
   gsl,
   hdf5,
+  libpq,
   libspatialindex,
   libspatialite,
   libzip,
   netcdf,
   ninja,
   openssl,
   pdal,
-  postgresql,
   proj,
   protobuf,
   python3,
@@ -116,13 +116,13 @@ mkDerivation rec {
       geos
       gsl
       hdf5
+      libpq
       libspatialindex
       libspatialite
       libzip
       netcdf
       openssl
       pdal
-      postgresql
       proj
       protobuf
       qca-qt5

diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix
@@ -27,7 +27,7 @@
 , ninja
 , openssl
 , pdal
-, postgresql
+, libpq
 , proj
 , protobuf
 , python3
@@ -119,7 +119,7 @@ in mkDerivation rec {
     netcdf
     openssl
     pdal
-    postgresql
+    libpq
     proj
     protobuf
     qca-qt5

diff --git a/pkgs/applications/gis/spatialite-gui/default.nix b/pkgs/applications/gis/spatialite-gui/default.nix
@@ -7,6 +7,7 @@
   curl,
   freexl,
   geos,
+  libpq,
   librasterlite2,
   librttopo,
   libspatialite,
@@ -16,7 +17,6 @@
   lz4,
   minizip,
   openjpeg,
-  postgresql,
   proj,
   sqlite,
   virtualpg,
@@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
       curl
       freexl
       geos
+      libpq
       librasterlite2
       librttopo
       libspatialite
@@ -55,7 +56,6 @@ stdenv.mkDerivation rec {
       lz4
       minizip
       openjpeg
-      postgresql
       proj
       sqlite
       virtualpg

diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix
@@ -9,7 +9,7 @@
   qmake,
   qtwayland,
   qtsvg,
-  postgresql,
+  libpq,
   cups,
   libxml2,
 }:
@@ -37,17 +37,16 @@ stdenv.mkDerivation rec {
       "CONFIG+=release"
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "PGSQL_INC=${lib.getDev postgresql}/include"
-      "PGSQL_LIB=${lib.getLib postgresql}/lib/libpq.dylib"
+      "PGSQL_INC=${lib.getDev libpq}/include"
+      "PGSQL_LIB=${lib.getLib libpq}/lib/libpq.dylib"
       "XML_INC=${libxml2.dev}/include/libxml2"
       "XML_LIB=${libxml2.out}/lib/libxml2.dylib"
       "PREFIX=${placeholder "out"}/Applications/pgModeler.app/Contents"
     ];
 
-  # todo: libpq would suffice here. Unfortunately this won't work, if one uses only postgresql.lib here.
   buildInputs =
     [
-      postgresql
+      libpq
       qtsvg
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]

diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  postgresql,
+  libpq,
   autoPatchelfHook,
   writeScript,
 }:
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     stdenv.cc.cc
-    postgresql.lib
+    libpq
   ];
 
   nativeBuildInputs = [ autoPatchelfHook ];

diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix
@@ -3,7 +3,7 @@
 , makeWrapper, ncurses, pkg-config, libxml2, sqlite, zlib
 , libpulseaudio, libopus, libogg, jansson, libsodium
 
-, postgresqlSupport ? true, postgresql }:
+, postgresqlSupport ? true, libpq }:
 
 stdenv.mkDerivation rec {
   pname = "gnunet";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     adns curl gmp gnutls libextractor libgcrypt libgnurl libidn
     libmicrohttpd libunistring libxml2 ncurses gettext libsodium
     sqlite zlib libpulseaudio libopus libogg jansson
-  ] ++ lib.optional postgresqlSupport postgresql;
+  ] ++ lib.optional postgresqlSupport libpq;
 
   preConfigure = ''
     # Brute force: since nix-worker chroots don't provide

diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix
@@ -30,8 +30,8 @@
   kreport,
   lcms2,
   libmysqlclient,
+  libpq,
   marble,
-  postgresql,
 }:
 
 mkDerivation rec {
@@ -74,8 +74,8 @@ mkDerivation rec {
     kreport
     lcms2
     libmysqlclient
+    libpq
     marble
-    postgresql
   ];
 
   propagatedUserEnvPkgs = [ kproperty ];

diff --git a/pkgs/applications/office/ledger-web/default.nix b/pkgs/applications/office/ledger-web/default.nix
@@ -3,7 +3,7 @@
   bundlerApp,
   bundlerUpdateScript,
   withPostgresql ? true,
-  postgresql,
+  libpq,
   withSqlite ? false,
   sqlite,
 }:
@@ -13,7 +13,7 @@ bundlerApp {
   gemdir = ./.;
   exes = [ "ledger_web" ];
 
-  buildInputs = lib.optional withPostgresql postgresql ++ lib.optional withSqlite sqlite;
+  buildInputs = lib.optional withPostgresql libpq ++ lib.optional withSqlite sqlite;
 
   passthru.updateScript = bundlerUpdateScript "ledger-web";
 

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
@@ -113,7 +113,7 @@
 , kwindowsystem ? null
 , variant ? "fresh"
 , symlinkJoin
-, postgresql
+, libpq
 , makeFontsConf
 , amiri
 , caladea
@@ -395,7 +395,7 @@ in stdenv.mkDerivation (finalAttrs: {
     pam
     perl
     poppler
-    postgresql
+    libpq
     python311
     sane-backends
     unixODBC

diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix
@@ -34,7 +34,7 @@
 , openssl
 , pango
 , pkg-config
-, postgresql
+, libpq
 , protobuf
 , python3
 , rdkafka
@@ -259,7 +259,7 @@ in
 
   pq-sys = attr: {
     nativeBuildInputs = [ pkg-config ];
-    buildInputs = [ postgresql ];
+    buildInputs = [ libpq ];
   };
 
   prost-build = attr: {

diff --git a/pkgs/by-name/al/algol68g/package.nix b/pkgs/by-name/al/algol68g/package.nix
@@ -5,10 +5,10 @@
   curl,
   gmp,
   gsl,
+  libpq,
   mpfr,
   ncurses,
   plotutils,
-  postgresql,
   pkg-config,
   withPDFDoc ? true,
 }:
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     gmp
     gsl
     plotutils
-    postgresql
+    libpq
   ];
 
   strictDeps = true;

diff --git a/pkgs/by-name/cp/cppdb/package.nix b/pkgs/by-name/cp/cppdb/package.nix
@@ -5,7 +5,7 @@
   cmake,
   sqlite,
   libmysqlclient,
-  postgresql,
+  libpq,
   unixODBC,
 }:
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     sqlite
     libmysqlclient
-    postgresql
+    libpq
     unixODBC
   ];
 

diff --git a/pkgs/by-name/cy/cyrus-imapd/package.nix b/pkgs/by-name/cy/cyrus-imapd/package.nix
@@ -27,14 +27,14 @@
   libchardet,
   libical,
   libmysqlclient,
+  libpq,
   libsrs2,
   libuuid,
   libxml2,
   nghttp2,
   openssl,
   pcre2,
   perl,
-  postgresql,
   rsync,
   shapelib,
   sqlite,
@@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: {
       xapian
     ]
     ++ lib.optionals withMySQL [ libmysqlclient ]
-    ++ lib.optionals withPgSQL [ postgresql ]
+    ++ lib.optionals withPgSQL [ libpq ]
     ++ lib.optionals withSQLite [ sqlite ];
 
   enableParallelBuilding = true;

diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix
@@ -6,10 +6,10 @@
   installShellFiles,
   libiconv,
   libmysqlclient,
+  libpq,
   nix-update-script,
   openssl,
   pkg-config,
-  postgresql,
   rustPlatform,
   sqlite,
   testers,
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs =
     [ openssl ]
     ++ lib.optional sqliteSupport sqlite
-    ++ lib.optional postgresqlSupport postgresql
+    ++ lib.optional postgresqlSupport libpq
     ++ lib.optionals mysqlSupport [
       libmysqlclient
       zlib

diff --git a/pkgs/by-name/dr/drogon/package.nix b/pkgs/by-name/dr/drogon/package.nix
@@ -14,7 +14,7 @@
   sqliteSupport ? true,
   sqlite,
   postgresSupport ? false,
-  postgresql,
+  libpq,
   redisSupport ? false,
   hiredis,
   mysqlSupport ? false,
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
       c-ares
     ]
     ++ lib.optional sqliteSupport sqlite
-    ++ lib.optional postgresSupport postgresql
+    ++ lib.optional postgresSupport libpq
     ++ lib.optional redisSupport hiredis
     # drogon uses mariadb for mysql (see https://github.com/drogonframework/drogon/wiki/ENG-02-Installation#Library-Dependencies)
     ++ lib.optionals mysqlSupport [