Skip to content

Commit c5a866b

Browse files
authored
Update to determinate by default (#208)
* Update to determinate by default Implements DeterminateSystems/nix-src#201 * Fixup the version verification script
1 parent 89b1f59 commit c5a866b

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

.github/verify-version.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ EXPECTED_VERSION="${1}"
77

88
INSTALLED_NIX_VERSION_OUTPUT=$(nix --version)
99
INSTALLED_NIX_VERSION=$(echo "${INSTALLED_NIX_VERSION_OUTPUT}" | awk '{print $NF}')
10-
EXPECTED_OUTPUT="nix (Nix) ${EXPECTED_VERSION}"
1110

12-
if [ "${INSTALLED_NIX_VERSION_OUTPUT}" != "${EXPECTED_OUTPUT}" ]; then
11+
if [ "${INSTALLED_NIX_VERSION}" != "${EXPECTED_VERSION}" ]; then
1312
echo "Nix version ${INSTALLED_NIX_VERSION} didn't match expected version ${EXPECTED_VERSION}"
1413
exit 1
1514
else

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ jobs:
153153
# https://github.com/DeterminateSystems/nix-installer/blob/v3.11.3
154154
- key: url
155155
value: https://github.com/DeterminateSystems/nix-installer/releases/download/v3.11.3/nix-installer-x86_64-linux
156-
nix-version: "2.32.0"
156+
nix-version: "2.31.2" # 3.11.3 is based on 2.31.2
157157

158158
steps:
159159
- uses: actions/checkout@v4

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ Differing from the upstream [Nix](https://github.com/NixOS/nix) installer script
9696
| Parameter | Description | Type | Default |
9797
| :---------------------- | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :----------------------------------------- | :------------------------------------------------------------- |
9898
| `backtrace` | The setting for [`RUST_BACKTRACE`][backtrace] | string | |
99-
| `determinate` | Whether to install [Determinate Nix](https://determinate.systems/enterprise) and log in to FlakeHub for private Flakes and binary caches. | Boolean | `false` |
99+
| `determinate` | Whether to install [Determinate Nix](https://determinate.systems/enterprise) and log in to FlakeHub for private Flakes and binary caches. | Boolean | `true` |
100100
| `extra-args` | Extra arguments to pass to the planner (prefer using structured `with:` arguments unless using a custom [planner]!) | string | |
101101
| `extra-conf` | Extra configuration lines for `/etc/nix/nix.conf` (includes `access-tokens` with `secrets.GITHUB_TOKEN` automatically if `github-token` is set) | string | |
102102
| `flakehub` | Deprecated. Implies `determinate`. | Boolean | `false` |

action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ inputs:
1010
determinate:
1111
description: |
1212
Whether to install [Determinate Nix](https://determinate.systems/enterprise) and log in to FlakeHub for private Flakes and binary caches.
13-
default: false
13+
default: true
1414
extra-args:
1515
description: Extra args to pass to the planner (prefer using structured `with:` arguments unless using a custom planner!)
1616
required: false

0 commit comments

Comments
 (0)