Skip to content

Commit 2fd3724

Browse files
authored
If determinate is false, pass --prefer-upstream (#202)
* If determinate is false, pass --prefer-upstream * Regenerate * Update to an installer version that supports preferring upstream * Delete the rev test, since rev uploads appoar to have broken a long time ago * Fixup: expect upstream nix at the moment
1 parent 45a18a6 commit 2fd3724

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -150,14 +150,10 @@ jobs:
150150
strategy:
151151
matrix:
152152
inputs:
153-
# https://github.com/DeterminateSystems/nix-installer/blob/v0.18.0
153+
# https://github.com/DeterminateSystems/nix-installer/blob/v3.11.3
154154
- key: url
155-
value: https://github.com/DeterminateSystems/nix-installer/releases/download/v0.18.0/nix-installer-x86_64-linux
156-
nix-version: "2.21.2"
157-
# https://github.com/DeterminateSystems/nix-installer/tree/7011c077ec491da410fbc39f68676b0908b9ce7e
158-
- key: revision
159-
value: 7011c077ec491da410fbc39f68676b0908b9ce7e
160-
nix-version: "2.19.2"
155+
value: https://github.com/DeterminateSystems/nix-installer/releases/download/v3.11.3/nix-installer-x86_64-linux
156+
nix-version: "2.32.0"
161157

162158
steps:
163159
- uses: actions/checkout@v4

dist/index.js

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/index.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ const FACT_SENT_SIGTERM = "sent_sigterm";
4848

4949
// Flags
5050
const FLAG_DETERMINATE = "--determinate";
51+
const FLAG_PREFER_UPSTREAM_NIX = "--prefer-upstream-nix";
5152

5253
// Pre/post state keys
5354
const STATE_DAEMONDIR = "DNI_DAEMONDIR";
@@ -432,6 +433,8 @@ class NixInstallerAction extends DetSysAction {
432433
if (this.extraArgs && !this.extraArgs.includes(FLAG_DETERMINATE)) {
433434
args.push(FLAG_DETERMINATE);
434435
}
436+
} else {
437+
args.push(FLAG_PREFER_UPSTREAM_NIX);
435438
}
436439

437440
return args;

0 commit comments

Comments
 (0)