Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nix hash convert: Support SRI hashes that lack trailing '=' characters (backport #12013) #12018

Merged
merged 4 commits into from
Dec 9, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 5, 2024

Motivation

Fixes #11996, #11997.

Also, don't fail on uppercase base-16 hashes.

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

Copy link
Contributor Author

mergify bot commented Dec 5, 2024

Cherry-pick of 408c2fa has failed:

On branch mergify/bp/2.25-maintenance/pr-12013
Your branch is ahead of 'origin/2.25-maintenance' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 408c2faf9.
  (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/nix/hash.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 new-cli Relating to the "nix" command with-tests Issues related to testing. PRs with tests have some priority labels Dec 5, 2024
Copy link
Contributor Author

mergify bot commented Dec 6, 2024

This pull request has been removed from the queue for the following reason: pull request dequeued.

Pull request #12018 has been dequeued. Rebase merges are not allowed on this repository.. The repository configuration doesn't allow rebase merge. The merge method configured in Mergify configuration must be allowed in the repository configuration settings..

You should look at the reason for the failure and decide if the pull request needs to be fixed or if you want to requeue it.

If you want to requeue this pull request, you need to post a comment with the text: @mergifyio requeue

@edolstra edolstra merged commit 8a81c24 into 2.25-maintenance Dec 9, 2024
20 of 22 checks passed
@edolstra edolstra deleted the mergify/bp/2.25-maintenance/pr-12013 branch December 9, 2024 12:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts merge-queue new-cli Relating to the "nix" command with-tests Issues related to testing. PRs with tests have some priority
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant