From 405ec170222740b2fd44d077275d37b4ea6124a7 Mon Sep 17 00:00:00 2001 From: Rhys Arkins Date: Sun, 8 Oct 2023 15:18:34 +0200 Subject: [PATCH] fix(nix): Allow nixpkgs with no ref (#25068) --- lib/modules/manager/nix/extract.spec.ts | 14 ++++++++++++-- lib/modules/manager/nix/extract.ts | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/modules/manager/nix/extract.spec.ts b/lib/modules/manager/nix/extract.spec.ts index e9a88ef8f9b90c..9645744c2a9208 100644 --- a/lib/modules/manager/nix/extract.spec.ts +++ b/lib/modules/manager/nix/extract.spec.ts @@ -52,7 +52,7 @@ describe('modules/manager/nix/extract', () => { ]); }); - it('ignores nixpkgs with no explicit ref', () => { + it('includes nixpkgs with no explicit ref', () => { const content = `{ inputs = { nixpkgs.url = "github:NixOS/nixpkgs"; @@ -61,6 +61,16 @@ describe('modules/manager/nix/extract', () => { const res = extractPackageFile(content); - expect(res).toBeNull(); + expect(res).toMatchObject({ + deps: [ + { + currentValue: undefined, + datasource: 'git-refs', + depName: 'nixpkgs', + packageName: 'https://github.com/NixOS/nixpkgs', + versioning: 'nixpkgs', + }, + ], + }); }); }); diff --git a/lib/modules/manager/nix/extract.ts b/lib/modules/manager/nix/extract.ts index d883e5b9ba49ca..5170e23a07dfe0 100644 --- a/lib/modules/manager/nix/extract.ts +++ b/lib/modules/manager/nix/extract.ts @@ -3,7 +3,7 @@ import { GitRefsDatasource } from '../../datasource/git-refs'; import { id as nixpkgsVersioning } from '../../versioning/nixpkgs'; import type { PackageDependency, PackageFileContent } from '../types'; -const nixpkgsRegex = regEx(/"github:nixos\/nixpkgs\/(?[a-z0-9-.]+)"/i); +const nixpkgsRegex = regEx(/"github:nixos\/nixpkgs(\/(?[a-z0-9-.]+))?"/i); export function extractPackageFile(content: string): PackageFileContent | null { const deps: PackageDependency[] = [];