Merged
Conversation
Motivated by alda-lang/alda#411
ericdallo
approved these changes
Mar 21, 2022
Contributor
Author
|
@ericdallo @SuperSandro2000 Could this be backported to NixOS 21.11 as the criteria in https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#criteria-for-backporting-changes apply? |
Contributor
|
Backport failed for Please cherry-pick the changes locally. git fetch origin release-21.11
git worktree add -d .worktree/backport-165182-to-release-21.11 origin/release-21.11
cd .worktree/backport-165182-to-release-21.11
git checkout -b backport-165182-to-release-21.11
ancref=$(git merge-base cf7556eea5a1477c87dbb4caf90cb896ec4d6ee8 90e831473c469efbc7414db16f7baffdbb538bfc)
git cherry-pick -x $ancref..90e831473c469efbc7414db16f7baffdbb538bfc |
Member
|
You need to create the PR manually because probably some other commit is missing and causes a merge conflict. |
Contributor
Author
|
Thanks, will do! |
Contributor
Author
|
For reference, manual backport PR is #167042. |
13 tasks
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
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.
Description of changes
Motivated by alda-lang/alda#411
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes