Skip to content

create cache entry for paths already in the nix store (backport #12911)#12927

Merged
Mic92 merged 1 commit into2.26-maintenancefrom
mergify/bp/2.26-maintenance/pr-12911
Apr 4, 2025
Merged

create cache entry for paths already in the nix store (backport #12911)#12927
Mic92 merged 1 commit into2.26-maintenancefrom
mergify/bp/2.26-maintenance/pr-12911

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Apr 4, 2025

This allows path:/nix/store/* paths to not be copied twice to the nix store.

Motivation

Context


Add 👍 to pull requests you find important.

The Nix maintainer team uses a GitHub project board to schedule and track reviews.


This is an automatic backport of pull request #12911 done by [Mergify](https://mergify.com).

@mergify mergify bot added the automatic backport This PR is a backport produced by automation (does not trigger backporting) label Apr 4, 2025
@mergify mergify bot requested a review from edolstra as a code owner April 4, 2025 14:11
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Apr 4, 2025

Cherry-pick of 61c6210 has failed:

On branch mergify/bp/2.26-maintenance/pr-12911
Your branch is up to date with 'origin/2.26-maintenance'.

You are currently cherry-picking commit 61c6210db.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/libfetchers/fetch-to-store.cc
	both modified:   src/libfetchers/fetch-to-store.hh
	both modified:   src/libfetchers/path.cc

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions github-actions bot added the fetching Networking with the outside (non-Nix) world, input locking label Apr 4, 2025
This allows path:/nix/store/* paths to not be copied twice to the nix
store.

(cherry picked from commit 61c6210)
@Mic92 Mic92 force-pushed the mergify/bp/2.26-maintenance/pr-12911 branch from 390d032 to 720cdd5 Compare April 4, 2025 14:15
@Mic92 Mic92 enabled auto-merge April 4, 2025 14:16
@Mic92 Mic92 merged commit 2244aad into 2.26-maintenance Apr 4, 2025
25 checks passed
@Mic92 Mic92 deleted the mergify/bp/2.26-maintenance/pr-12911 branch April 4, 2025 14:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automatic backport This PR is a backport produced by automation (does not trigger backporting) conflicts fetching Networking with the outside (non-Nix) world, input locking merge-queue

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant