palo/nixos-config
palo/nixos-config
Watch
1
0
Fork
You've already forked nixos-config
 1
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

fix: drop redundant pkgs.git, gitSVN already provides git #10

Open
eumel wants to merge 1 commit from eumel/nixos-config:fix/git-buildenv-collision into main
pull from: eumel/nixos-config:fix/git-buildenv-collision
merge into: palo:main
Conversation 0 Commits 1 Files changed 1 -1
eumel commented 2026-10-10 12:45:46 +02:00
Contributor
Copy link

Root cause (CI run #3577): home-manager-path failed with a buildEnv collision:

pkgs.buildEnv error: two given paths contain a conflicting subpath:
  git-with-svn-2.55.0/libexec/git-core/git-whatchanged
  git-2.55.0/libexec/git-core/git-whatchanged

Why: homes/common/git.nix listed both pkgs.git and pkgs.gitSVN.
gitSVN (= git-with-svn) already contains the full git suite — the extra
pkgs.git creates two different git builds in the same home-manager-path buildEnv.

Fix: Drop pkgs.git from the package list. Plain git remains available
via gitSVN (and programs.git.enable).

**Root cause (CI run #3577):** `home-manager-path` failed with a `buildEnv` collision: ``` pkgs.buildEnv error: two given paths contain a conflicting subpath: git-with-svn-2.55.0/libexec/git-core/git-whatchanged git-2.55.0/libexec/git-core/git-whatchanged ``` **Why:** `homes/common/git.nix` listed both `pkgs.git` and `pkgs.gitSVN`. `gitSVN` (= git-with-svn) already contains the full git suite — the extra `pkgs.git` creates two different git builds in the same `home-manager-path` buildEnv. **Fix:** Drop `pkgs.git` from the package list. Plain `git` remains available via `gitSVN` (and `programs.git.enable`).
home-manager-path buildEnv failed with:
  conflicting subpath: git-with-svn-2.55.0/git-whatchanged vs git-2.55.0/git-whatchanged

pkgs.gitSVN (git-with-svn) already contains full git, so the separate
pkgs.git entry causes two different git builds to collide in buildEnv.
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u fix/git-buildenv-collision:eumel-fix/git-buildenv-collision
git switch eumel-fix/git-buildenv-collision

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff eumel-fix/git-buildenv-collision
git switch eumel-fix/git-buildenv-collision
git rebase main
git switch main
git merge --ff-only eumel-fix/git-buildenv-collision
git switch eumel-fix/git-buildenv-collision
git rebase main
git switch main
git merge --no-ff eumel-fix/git-buildenv-collision
git switch main
git merge --squash eumel-fix/git-buildenv-collision
git switch main
git merge --ff-only eumel-fix/git-buildenv-collision
git switch main
git merge eumel-fix/git-buildenv-collision
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
palo/nixos-config!10
No description provided.