Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile-15
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile-17
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile-multigres
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile-orioledb-17
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
6 changes: 3 additions & 3 deletions ansible/postgres_release.yml
Original file line number Diff line number Diff line change
@@ -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"
8 changes: 4 additions & 4 deletions docs/multigres-image.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions nix/docs/start-here.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions packer/scripts/nix-provision.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions packer/scripts/qemu-bootstrap-nix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading