From 6ef73da198ec09af7e6ab5162e3af7200cb91841 Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Thu, 22 Oct 2026 09:58:28 -0400 Subject: [PATCH 1/2] Actually update nix to latest release I did the work to make this easier and then forgot to actually upgrade. Also drop nix versions in the docs prose. --- Dockerfile-15 | 4 ++-- Dockerfile-17 | 4 ++-- Dockerfile-multigres | 4 ++-- Dockerfile-orioledb-17 | 4 ++-- .../admin_api_scripts/pg_upgrade_scripts/initiate.sh | 4 ++-- docs/multigres-image.md | 8 ++++---- nix/docs/start-here.md | 10 +++++----- packer/scripts/nix-provision.sh | 4 ++-- packer/scripts/qemu-bootstrap-nix.sh | 4 ++-- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Dockerfile-15 b/Dockerfile-15 index 80ef00380d..fbc3ccb610 100644 --- a/Dockerfile-15 +++ b/Dockerfile-15 @@ -27,8 +27,8 @@ extra-experimental-features = nix-command flakes extra-substituters = https://nix-postgres-artifacts.s3.amazonaws.com extra-trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI= EOF -ARG NIX_VERSION=2.34.6 -ARG NIX_INSTALLER_HASH=bf6d12da4aeaae38ab509dc736df648597bcdee051046ea76d3d53d5b18fa54a +ARG NIX_VERSION=2.35.3 +ARG NIX_INSTALLER_HASH=69d0fe8fba8fe88f94c98b09964691ac9950abc7ecbf2ba861dc0533cfd901e9 RUN curl -fsSL "https://releases.nixos.org/nix/nix-$NIX_VERSION/install" -o /tmp/nix-install && \ echo "$NIX_INSTALLER_HASH /tmp/nix-install" | sha256sum -c - && \ sh /tmp/nix-install --daemon --no-channel-add --yes --nix-extra-conf-file /tmp/extra-nix.conf && \ diff --git a/Dockerfile-17 b/Dockerfile-17 index b208c6cb39..beacdff443 100644 --- a/Dockerfile-17 +++ b/Dockerfile-17 @@ -27,8 +27,8 @@ extra-experimental-features = nix-command flakes extra-substituters = https://nix-postgres-artifacts.s3.amazonaws.com extra-trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI= EOF -ARG NIX_VERSION=2.34.6 -ARG NIX_INSTALLER_HASH=bf6d12da4aeaae38ab509dc736df648597bcdee051046ea76d3d53d5b18fa54a +ARG NIX_VERSION=2.35.3 +ARG NIX_INSTALLER_HASH=69d0fe8fba8fe88f94c98b09964691ac9950abc7ecbf2ba861dc0533cfd901e9 RUN curl -fsSL "https://releases.nixos.org/nix/nix-$NIX_VERSION/install" -o /tmp/nix-install && \ echo "$NIX_INSTALLER_HASH /tmp/nix-install" | sha256sum -c - && \ sh /tmp/nix-install --daemon --no-channel-add --yes --nix-extra-conf-file /tmp/extra-nix.conf && \ diff --git a/Dockerfile-multigres b/Dockerfile-multigres index f6c0a851d7..edc47ea4ee 100644 --- a/Dockerfile-multigres +++ b/Dockerfile-multigres @@ -28,8 +28,8 @@ extra-experimental-features = nix-command flakes extra-substituters = https://nix-postgres-artifacts.s3.amazonaws.com extra-trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI= EOF -ARG NIX_VERSION=2.34.6 -ARG NIX_INSTALLER_HASH=bf6d12da4aeaae38ab509dc736df648597bcdee051046ea76d3d53d5b18fa54a +ARG NIX_VERSION=2.35.3 +ARG NIX_INSTALLER_HASH=69d0fe8fba8fe88f94c98b09964691ac9950abc7ecbf2ba861dc0533cfd901e9 RUN curl -fsSL "https://releases.nixos.org/nix/nix-$NIX_VERSION/install" -o /tmp/nix-install && \ echo "$NIX_INSTALLER_HASH /tmp/nix-install" | sha256sum -c - && \ sh /tmp/nix-install --daemon --no-channel-add --yes --nix-extra-conf-file /tmp/extra-nix.conf && \ diff --git a/Dockerfile-orioledb-17 b/Dockerfile-orioledb-17 index 8f6959d3fc..35c069076a 100644 --- a/Dockerfile-orioledb-17 +++ b/Dockerfile-orioledb-17 @@ -27,8 +27,8 @@ extra-experimental-features = nix-command flakes extra-substituters = https://nix-postgres-artifacts.s3.amazonaws.com extra-trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI= EOF -ARG NIX_VERSION=2.34.6 -ARG NIX_INSTALLER_HASH=bf6d12da4aeaae38ab509dc736df648597bcdee051046ea76d3d53d5b18fa54a +ARG NIX_VERSION=2.35.3 +ARG NIX_INSTALLER_HASH=69d0fe8fba8fe88f94c98b09964691ac9950abc7ecbf2ba861dc0533cfd901e9 RUN curl -fsSL "https://releases.nixos.org/nix/nix-$NIX_VERSION/install" -o /tmp/nix-install && \ echo "$NIX_INSTALLER_HASH /tmp/nix-install" | sha256sum -c - && \ sh /tmp/nix-install --daemon --no-channel-add --yes --nix-extra-conf-file /tmp/extra-nix.conf && \ diff --git a/ansible/files/admin_api_scripts/pg_upgrade_scripts/initiate.sh b/ansible/files/admin_api_scripts/pg_upgrade_scripts/initiate.sh index 27b487d39f..7c8b5b0075 100755 --- a/ansible/files/admin_api_scripts/pg_upgrade_scripts/initiate.sh +++ b/ansible/files/admin_api_scripts/pg_upgrade_scripts/initiate.sh @@ -60,8 +60,8 @@ PGBINOLD="/usr/lib/postgresql/bin" PG_UPGRADE_BIN_DIR="/tmp/pg_upgrade_bin/$PGVERSION" NIX_INSTALLER_PATH="/tmp/persistent/nix-installer" NIX_INSTALLER_PACKAGE_PATH="$NIX_INSTALLER_PATH.tar.gz" -NIX_VERSION="2.34.6" -NIX_OFFICIAL_INSTALLER_SHA256="bf6d12da4aeaae38ab509dc736df648597bcdee051046ea76d3d53d5b18fa54a" +NIX_VERSION="2.35.3" +NIX_OFFICIAL_INSTALLER_SHA256="69d0fe8fba8fe88f94c98b09964691ac9950abc7ecbf2ba861dc0533cfd901e9" if [ -L "$PGBINOLD/pg_upgrade" ]; then BINARY_PATH=$(readlink -f "$PGBINOLD/pg_upgrade") diff --git a/docs/multigres-image.md b/docs/multigres-image.md index 848f0b83e4..33b433a0a5 100644 --- a/docs/multigres-image.md +++ b/docs/multigres-image.md @@ -99,12 +99,12 @@ extra-trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7V Read about the binary cache in [/nix/docs/binary-cache.md](/nix/docs/binary-cache.md). -### Step 2: Install Nix 2.34.6 +### Step 2: Install Nix -Run the following command to install Nix 2.34.6 (the version used in CI) with the custom configuration: +Run the following command to install the Nix version used in CI (pinned in `.github/actions/install-nix/setup-nix.sh`) with the custom configuration: ```bash -curl -L https://releases.nixos.org/nix/nix-2.34.6/install | sh -s -- --daemon --yes --nix-extra-conf-file ./nix.conf.extra +curl -L https://releases.nixos.org/nix/nix-2.35.3/install | sh -s -- --daemon --yes --nix-extra-conf-file ./nix.conf.extra ``` This will install Nix with our build caches pre-configured, which should eliminate substituter-related errors. @@ -115,7 +115,7 @@ the Nix tools installed on `$PATH` and so that your user shell can see the extra settings. You should now be able to do something like the following; try running these -same commands on your machine: +same commands on your machine. Your versions are likely different from the ones shown: ``` $ nix --version diff --git a/nix/docs/start-here.md b/nix/docs/start-here.md index 38c5593aa7..e93e8dddde 100644 --- a/nix/docs/start-here.md +++ b/nix/docs/start-here.md @@ -63,13 +63,13 @@ extra-trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7V Read about the binary cache in [/nix/docs/binary-cache.md](/nix/docs/binary-cache.md). -### Step 2: Install Nix 2.34.6 +### Step 2: Install Nix -Run the following command to install Nix 2.34.6 (the version used in CI) with the custom configuration: +Run the following command to install the Nix version used in CI (pinned in `.github/actions/install-nix/setup-nix.sh`) with the custom configuration: ```bash -curl -fsSL https://releases.nixos.org/nix/nix-2.34.6/install -o nix-install -echo "bf6d12da4aeaae38ab509dc736df648597bcdee051046ea76d3d53d5b18fa54a nix-install" | sha256sum -c - +curl -fsSL https://releases.nixos.org/nix/nix-2.35.3/install -o nix-install +echo "69d0fe8fba8fe88f94c98b09964691ac9950abc7ecbf2ba861dc0533cfd901e9 nix-install" | sha256sum -c - sh nix-install --daemon --yes --nix-extra-conf-file ./nix.conf ``` @@ -83,7 +83,7 @@ the Nix tools installed on `$PATH` and so that your user shell can see the extra settings. You should now be able to do something like the following; try running these -same commands on your machine: +same commands on your machine. Your versions are likely different from the ones shown: ``` $ nix --version diff --git a/packer/scripts/nix-provision.sh b/packer/scripts/nix-provision.sh index daa427d386..083d77291f 100755 --- a/packer/scripts/nix-provision.sh +++ b/packer/scripts/nix-provision.sh @@ -28,8 +28,8 @@ function install_packages { } function install_nix() { - local nix_version=2.34.6 - local nix_installer_sha256=bf6d12da4aeaae38ab509dc736df648597bcdee051046ea76d3d53d5b18fa54a + local nix_version=2.35.3 + local nix_installer_sha256=69d0fe8fba8fe88f94c98b09964691ac9950abc7ecbf2ba861dc0533cfd901e9 local nix_installer nix_installer=$(mktemp) curl -fsSL "https://releases.nixos.org/nix/nix-${nix_version}/install" -o "$nix_installer" diff --git a/packer/scripts/qemu-bootstrap-nix.sh b/packer/scripts/qemu-bootstrap-nix.sh index d4fdda6f98..bc20d627b2 100755 --- a/packer/scripts/qemu-bootstrap-nix.sh +++ b/packer/scripts/qemu-bootstrap-nix.sh @@ -129,8 +129,8 @@ function setup_locale { ################# function install_nix() { - local nix_version=2.34.6 - local nix_installer_sha256=bf6d12da4aeaae38ab509dc736df648597bcdee051046ea76d3d53d5b18fa54a + local nix_version=2.35.3 + local nix_installer_sha256=69d0fe8fba8fe88f94c98b09964691ac9950abc7ecbf2ba861dc0533cfd901e9 local nix_installer nix_installer=$(mktemp) curl -fsSL "https://releases.nixos.org/nix/nix-${nix_version}/install" -o "$nix_installer" From 111ffe620e9209a724c30628d5b2363880fe8e11 Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Thu, 22 Oct 2026 09:52:13 -0400 Subject: [PATCH 2/2] Bump versions to .007 --- ansible/postgres_release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/postgres_release.yml b/ansible/postgres_release.yml index b603566ab6..4ec61582b6 100644 --- a/ansible/postgres_release.yml +++ b/ansible/postgres_release.yml @@ -1,5 +1,5 @@ --- postgres_release: - postgresorioledb-17: "17.11.0.006-orioledb" - postgres17: "17.11.0.006" - postgres15: "15.19.0.006" + postgresorioledb-17: "17.11.0.007-orioledb" + postgres17: "17.11.0.007" + postgres15: "15.19.0.007"