Are you following the right branch?

• My Nixpkgs and Home Manager versions are in sync

Is there an existing issue for this?

• I have searched the existing issues

Issue description

Configure git to use branch.autosetupmerge: simple.

git config --global branch.autosetupmerge simple

Try to run ./format:

$ ./format
fatal: bad boolean config value 'simple' for 'branch.autosetupmerge'
fatal: bad boolean config value 'simple' for 'branch.autosetupmerge'
<stdin>:1:1:
  |
1 | <empty line>
  | ^
unexpected end of input
expecting expression

This is due to format installs git and pins to a 2 year old commit https://github.com/NixOS/nixpkgs/archive/6616de389ed55fba6eeba60377fc04732d5a207c.tar.gz. This version includes a git that does not support those configuration options.

Maintainer CC

No response

System information

- system: `"x86_64-linux"`
 - host os: `Linux 6.10.3, NixOS, 24.11 (Vicuna), 24.11.20240814.5a1fae6`
 - multi-user?: `yes`
 - sandbox: `yes`
 - version: `nix-env (Lix, like Nix) 2.90.0`
 - channels(root): `"nixos-18.09.2574.a7e559a5504, nixpkgs-19.03pre160749.3a393eecafb"`
 - nixpkgs: `/nix/store/4x7w8l5rbmngv03rasgbl9cph0lydsbr-source`