[staging-next] git-annex: apply workaround for test failure with git 2.50#424682
Merged
vcunat merged 1 commit intoNixOS:staging-nextfrom Jul 13, 2025
Merged
[staging-next] git-annex: apply workaround for test failure with git 2.50#424682vcunat merged 1 commit intoNixOS:staging-nextfrom
vcunat merged 1 commit intoNixOS:staging-nextfrom
Conversation
The next haskellPackages bulk update will also resolve this, but picking the patch will prevent a broken git-annex until the next staging-next is merged into master.
nixpkgs-ci
bot
added
10.rebuild-linux: 11-100
vcunat
pushed a commit
that referenced
this pull request
Aug 7, 2025
The next haskellPackages bulk update will also resolve this, but picking the patch will prevent a broken git-annex until the next staging-next is merged into master. (cherry picked from commit 75542a9) (from PR #424682) https://hydra.nixos.org/build/303801265
Contributor
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin release-25.05
git worktree add -d .worktree/backport-424682-to-release-25.05 origin/release-25.05
cd .worktree/backport-424682-to-release-25.05
git switch --create backport-424682-to-release-25.05
git cherry-pick -x 75542a9b8781b58538ec3755fdc3816c67c7a166 |
Member
|
Ah, my bad. The thing experienced on current |
Member
|
Fixed in PR #438309 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The next haskellPackages bulk update will also resolve this, but picking the patch will prevent a broken git-annex until the next staging-next is merged into master.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.