From 98ccdbbbff22832b9b3ef09a327a6d7a0fecbcd5 Mon Sep 17 00:00:00 2001 From: Sean D Gillespie Date: Mon, 27 Jan 2025 11:25:44 -0500 Subject: [PATCH] chore(nix): Upgrade postgresql@17 --- flake.nix | 3 ++- nix/docker.nix | 4 ++-- nix/nixos/tests/services-basic-test.nix | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 71f883421..03c5b07a2 100644 --- a/flake.nix +++ b/flake.nix @@ -265,7 +265,7 @@ # Database tests let postgresTest = { - build-tools = [ pkgs.pkgsBuildHost.postgresql_14 ]; + build-tools = [ pkgs.pkgsBuildHost.postgresql_17 ]; inherit preCheck; inherit postCheck; }; @@ -498,6 +498,7 @@ }; legacyPackages = pkgs; + legacyPackagesUpstream = nixpkgsUpstream; packages = lib.optionalAttrs (system == "x86_64-linux") { inherit diff --git a/nix/docker.nix b/nix/docker.nix index 8c8d6427f..fe20d79a9 100644 --- a/nix/docker.nix +++ b/nix/docker.nix @@ -10,7 +10,7 @@ , bashInteractive, cacert, cardano-cli, cardano-db-sync, cardano-db-tool , cardano-smash-server, coreutils, curl, findutils, getconf, glibcLocales , gnused, gnutar, gzip, jq, iana-etc, iproute, iputils, lib, libidn, libpqxx -, postgresql_14, socat, utillinux +, postgresql_17, socat, utillinux }: let @@ -46,7 +46,7 @@ let iputils # Useful utilities for Linux networking libidn # Library for internationalized domain names libpqxx # A C++ library to access PostgreSQL databases - postgresql_14 # A powerful, open source object-relational database system + postgresql_17 # A powerful, open source object-relational database system socat # Utility for bidirectional data transfer utillinux # System utilities for Linux cardano-cli # tool for interacting with cardano-node diff --git a/nix/nixos/tests/services-basic-test.nix b/nix/nixos/tests/services-basic-test.nix index 1ba761fe2..4ab1b482f 100644 --- a/nix/nixos/tests/services-basic-test.nix +++ b/nix/nixos/tests/services-basic-test.nix @@ -47,7 +47,7 @@ with pkgs; systemd.services.cardano-db-sync.serviceConfig.SupplementaryGroups = "cardano-node"; services.postgresql = { enable = true; - package = postgresql_14; + package = postgresql_17; enableTCPIP = false; ensureDatabases = [ "${config.services.cardano-db-sync.postgres.database}" ]; initialScript = builtins.toFile "enable-pgcrypto.sql" ''