fix(nix): fix flake lock refresh

renovatebot · Feb 2, 2025 · 5021fa2 · 5021fa2
1 parent 52ab2d8
commit 5021fa2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/lib/modules/manager/nix/artifacts.ts b/lib/modules/manager/nix/artifacts.ts
@@ -4,18 +4,17 @@ import { logger } from '../../../logger';
 import { findGithubToken } from '../../../util/check-token';
 import { exec } from '../../../util/exec';
 import type { ExecOptions } from '../../../util/exec/types';
-import { readLocalFile } from '../../../util/fs';
+import { getSiblingFileName, readLocalFile } from '../../../util/fs';
 import { getRepoStatus } from '../../../util/git';
 import * as hostRules from '../../../util/host-rules';
-import { regEx } from '../../../util/regex';
 import type { UpdateArtifact, UpdateArtifactsResult } from '../types';
 
 export async function updateArtifacts({
   packageFileName,
   config,
   updatedDeps,
 }: UpdateArtifact): Promise<UpdateArtifactsResult[] | null> {
-  const lockFileName = packageFileName.replace(regEx(/\.nix$/), '.lock');
+  const lockFileName = getSiblingFileName(packageFileName, 'flake.lock');
   const existingLockFileContent = await readLocalFile(lockFileName, 'utf8');
   if (!existingLockFileContent) {
     logger.debug('No flake.lock found');

diff --git a/lib/modules/manager/nix/extract.ts b/lib/modules/manager/nix/extract.ts
@@ -37,6 +37,13 @@ export async function extractPackageFile(
     });
   }
 
+  if (!packageFile.match(regEx(/\.lock$/))) {
+    if (deps.length) {
+      return { deps };
+    }
+    return null;
+  }
+
   const flakeLockParsed = NixFlakeLock.safeParse(lockContents);
   if (!flakeLockParsed.success) {
     logger.debug(
@@ -93,7 +100,6 @@ export async function extractPackageFile(
       case 'github':
         deps.push({
           depName,
-          currentValue: flakeOriginal.ref,
           currentDigest: flakeLocked.rev,
           datasource: GitRefsDatasource.id,
           packageName: `https://${flakeOriginal.host ?? 'github.com'}/${flakeOriginal.owner}/${flakeOriginal.repo}`,
@@ -102,7 +108,6 @@ export async function extractPackageFile(
       case 'gitlab':
         deps.push({
           depName,
-          currentValue: flakeOriginal.ref,
           currentDigest: flakeLocked.rev,
           datasource: GitRefsDatasource.id,
           packageName: `https://${flakeOriginal.host ?? 'gitlab.com'}/${flakeOriginal.owner}/${flakeOriginal.repo}`,
@@ -111,7 +116,6 @@ export async function extractPackageFile(
       case 'git':
         deps.push({
           depName,
-          currentValue: flakeOriginal.ref,
           currentDigest: flakeLocked.rev,
           datasource: GitRefsDatasource.id,
           packageName: flakeOriginal.url,
@@ -120,7 +124,6 @@ export async function extractPackageFile(
       case 'sourcehut':
         deps.push({
           depName,
-          currentValue: flakeOriginal.ref,
           currentDigest: flakeLocked.rev,
           datasource: GitRefsDatasource.id,
           packageName: `https://${flakeOriginal.host ?? 'git.sr.ht'}/${flakeOriginal.owner}/${flakeOriginal.repo}`,
@@ -129,7 +132,6 @@ export async function extractPackageFile(
       case 'tarball':
         deps.push({
           depName,
-          currentValue: flakeLocked.ref,
           currentDigest: flakeLocked.rev,
           datasource: GitRefsDatasource.id,
           // type tarball always contains this link

diff --git a/lib/modules/manager/nix/index.ts b/lib/modules/manager/nix/index.ts
@@ -8,7 +8,7 @@ export const supportsLockFileMaintenance = true;
 export const url = 'https://nix.dev';
 
 export const defaultConfig = {
-  fileMatch: ['(^|/)flake\\.nix$'],
+  fileMatch: ['(^|/)flake\\.(nix|lock)$'],
   commitMessageTopic: 'nix',
   commitMessageExtra: 'to {{newValue}}',
   enabled: false,