Unverified Commit fb3a374b authored by Wolfgang Walther's avatar Wolfgang Walther Committed by GitHub
Browse files

various: use libpq instead of postgresql (#389896)

parents d07ebbab e64f47c5

pkgs/applications/blockchains/lighthouse/default.nix

+0 −5
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
, nix-update-script

, openssl

, pkg-config

, libpq

, protobuf

, rustPlatform

, rust-jemalloc-sys
@@ -119,10 +118,6 @@ rustPlatform.buildRustPackage rec { 
    "--skip subnet_service::tests::sync_committee_service::subscribe_and_unsubscribe"

  ];



  nativeCheckInputs = [

    libpq

  ];



  passthru = {

    tests.version = testers.testVersion {

      package = lighthouse;

pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ in 
  poke = addPackageRequires super.poke [ self.poke-mode ];



  pq = super.pq.overrideAttrs (old: {

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

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

  });



  preview-auto = mkHome super.preview-auto;

pkgs/by-name/bi/biboumi/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
  withIDN ? true,

  libidn,

  withPostgreSQL ? false,

  postgresql,

  libpq,

  withSQLite ? true,

  sqlite,

  withUDNS ? true,
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec { 
      botan2

    ]

    ++ lib.optional withIDN libidn

    ++ lib.optional withPostgreSQL postgresql

    ++ lib.optional withPostgreSQL libpq

    ++ lib.optional withSQLite sqlite

    ++ lib.optional withUDNS udns;

pkgs/by-name/gl/glom/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
  isocodes,

  gtksourceview,

  gtksourceviewmm,

  postgresql_15,

  postgresql,

  gobject-introspection,

  yelp-tools,

  wrapGAppsHook3,
@@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: { 
    isocodes

    gtksourceview

    gtksourceviewmm

    postgresql_15 # for postgresql utils

    postgresql # for postgresql utils

  ];



  enableParallelBuilding = true;
@@ -128,7 +128,7 @@ stdenv.mkDerivation (finalAttrs: { 


  configureFlags = [

    "--with-boost-python=boost_python${lib.versions.major python311.version}${lib.versions.minor python311.version}"

    "--with-postgres-utils=${lib.getBin postgresql_15}/bin"

    "--with-postgres-utils=${lib.getBin postgresql}/bin"

  ];



  makeFlags = [

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

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  libmysqlclient,

  log4cplus,

  openssl,

  postgresql,

  libpq,

  python3,



  # tests
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec { 
      "--localstatedir=/var"

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

    ]

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

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

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



  postConfigure = ''