Skip to content

Add trailing commas on addFlag incantations (backport #12967)#12969

Closed
mergify[bot] wants to merge 2 commits into2.25-maintenancefrom
mergify/bp/2.25-maintenance/pr-12967
Closed

Add trailing commas on addFlag incantations (backport #12967)#12969
mergify[bot] wants to merge 2 commits into2.25-maintenancefrom
mergify/bp/2.25-maintenance/pr-12967

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Apr 7, 2025

cc @Ericson2314, from #12957

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 #12967 done by [Mergify](https://mergify.com).

grahamc added 2 commits April 7, 2025 23:15
(cherry picked from commit 06acbd3)

# Conflicts:
#	src/libcmd/installables.cc
#	src/nix/copy.cc
#	src/nix/flake.cc
(cherry picked from commit 9b47b2b)
@mergify mergify bot added automatic backport This PR is a backport produced by automation (does not trigger backporting) conflicts labels Apr 7, 2025
@mergify mergify bot requested a review from Ericson2314 as a code owner April 7, 2025 23:15
@mergify mergify bot added the merge-queue label Apr 7, 2025
@mergify mergify bot requested a review from edolstra as a code owner April 7, 2025 23:15
@mergify
Copy link
Contributor Author

mergify bot commented Apr 7, 2025

Cherry-pick of 06acbd3 has failed:

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

You are currently cherry-picking commit 06acbd37b.
  (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)

Changes to be committed:
	modified:   src/libcmd/command.cc
	modified:   src/libcmd/common-eval-args.cc
	modified:   src/libmain/common-args.cc
	modified:   src/libmain/shared.cc
	modified:   src/libstore/globals.cc
	modified:   src/nix/build.cc
	modified:   src/nix/bundle.cc
	modified:   src/nix/derivation-show.cc
	modified:   src/nix/develop.cc
	modified:   src/nix/env.cc
	modified:   src/nix/prefetch.cc
	modified:   src/nix/sigs.cc
	modified:   src/nix/store-delete.cc
	modified:   src/nix/store-gc.cc
	modified:   src/nix/upgrade-nix.cc
	modified:   src/nix/verify.cc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/libcmd/installables.cc
	both modified:   src/nix/copy.cc
	both modified:   src/nix/flake.cc

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 new-cli Relating to the "nix" command label Apr 7, 2025
@edolstra edolstra closed this Apr 8, 2025
@xokdvium xokdvium deleted the mergify/bp/2.25-maintenance/pr-12967 branch October 7, 2025 21:47
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 merge-queue new-cli Relating to the "nix" command

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants