From 814a93a58c32bf8ad623ee6242e1c007e4fdf5a1 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Sat, 2 Nov 2024 07:11:29 +0100
Subject: [PATCH] fix(nix): simplify --extra-experimental-features argument
(#32289)
---
lib/modules/manager/nix/artifacts.spec.ts | 9 +++------
lib/modules/manager/nix/artifacts.ts | 4 +---
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/lib/modules/manager/nix/artifacts.spec.ts b/lib/modules/manager/nix/artifacts.spec.ts
index 7b741ee822..7de02bf272 100644
--- a/lib/modules/manager/nix/artifacts.spec.ts
+++ b/lib/modules/manager/nix/artifacts.spec.ts
@@ -36,17 +36,14 @@ process.env.CONTAINERBASE = 'true';
const config: UpdateArtifactsConfig = {};
const lockMaintenanceConfig = { ...config, isLockFileMaintenance: true };
const updateInputCmd = `nix \
- --extra-experimental-features nix-command \
- --extra-experimental-features flakes \
+--extra-experimental-features 'nix-command flakes' \
flake lock --update-input nixpkgs`;
const updateInputTokenCmd = `nix \
- --extra-experimental-features nix-command \
- --extra-experimental-features flakes \
+--extra-experimental-features 'nix-command flakes' \
--extra-access-tokens github.com=token \
flake lock --update-input nixpkgs`;
const lockfileMaintenanceCmd = `nix \
- --extra-experimental-features nix-command \
- --extra-experimental-features flakes \
+--extra-experimental-features 'nix-command flakes' \
flake update`;
describe('modules/manager/nix/artifacts', () => {
diff --git a/lib/modules/manager/nix/artifacts.ts b/lib/modules/manager/nix/artifacts.ts
index 411cfb160d..4180f37bbc 100644
--- a/lib/modules/manager/nix/artifacts.ts
+++ b/lib/modules/manager/nix/artifacts.ts
@@ -22,9 +22,7 @@ export async function updateArtifacts({
return null;
}
- let cmd = `nix \
- --extra-experimental-features nix-command \
- --extra-experimental-features flakes `;
+ let cmd = `nix --extra-experimental-features 'nix-command flakes' `;
const token = findGithubToken(
hostRules.find({
--
GitLab