[staging-next] mariadb: Drop stale fix#149096
Merged
r-burns merged 1 commit intoNixOS:staging-nextfrom Dec 9, 2021
Merged
Conversation
Upstream has updated to no longer need the changes messing with the `version` file.
trofi
approved these changes
Dec 6, 2021
Contributor
trofi
left a comment
There was a problem hiding this comment.
Fixes build failure for me. Thank you!
Contributor
|
I took a crack at this in #148691 but kept the toplevel VERSION -> VERSION_FULL rename. Is that not needed anymore? |
Contributor
Author
|
@r-burns, I didn't get any build failures without it. I'm pretty sure I just did that latter rename to make it less confusing, at least that was the intent. |
This was referenced Dec 7, 2021
fabianhjr
approved these changes
Dec 9, 2021
Member
fabianhjr
left a comment
There was a problem hiding this comment.
Builds and works with digikam
Contributor
|
Works for me too, let's get this merged :) |
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: |
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
5 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.
Motivation for this change
The stdenv LLVM bump had an LLVM 11 fix for mariadb that has since been fixed upstream.
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