From 6c5dc5d57f446a9c65d01699a9b16963d54d4e06 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Mon, 17 Nov 2025 03:39:53 +0800 Subject: [PATCH] fetchgit: default nonConeMode to null and manage its default internally --- pkgs/build-support/fetchgit/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index ef2c2cd43093..eac73f713c74 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -74,7 +74,8 @@ lib.makeOverridable ( deepClone ? false, branchName ? null, sparseCheckout ? lib.optional (rootDir != "") rootDir, - nonConeMode ? rootDir != "", + # When null, will default to: `rootDir != ""` + nonConeMode ? null, nativeBuildInputs ? [ ], # Shell code executed before the file has been fetched. This, in # particular, can do things like set NIX_PREFETCH_GIT_CHECKOUT_HOOK to @@ -164,7 +165,6 @@ lib.makeOverridable ( fetchSubmodules deepClone branchName - nonConeMode preFetch postFetch fetchTags @@ -178,6 +178,7 @@ lib.makeOverridable ( leaveDotGit else deepClone || fetchTags; + nonConeMode = lib.defaultTo (rootDir != "") nonConeMode; inherit tag; revCustom = rev; rev = getRevWithTag {