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.

Sign up for GitHub

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

Jump to bottom

[staging-next] mariadb: Drop stale fix #149096

Merged
merged 1 commit into from
Dec 9, 2021
Merged

[staging-next] mariadb: Drop stale fix #149096

merged 1 commit into from
Dec 9, 2021

Conversation

toonn
Copy link
Contributor

@toonn toonn commented Dec 6, 2021

Motivation for this change

The stdenv LLVM bump had an LLVM 11 fix for mariadb that has since been fixed upstream.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@toonn
mariadb: Drop stale LLVM 11 fix
62572ee 
Upstream has updated to no longer need the changes messing with the
`version` file.
@toonn toonn mentioned this pull request Dec 6, 2021
Merged
@ofborg ofborg bot requested a review from thoughtpolice December 6, 2021 18:56
trofi
trofi approved these changes Dec 6, 2021
View reviewed changes
Copy link
Contributor

@trofi trofi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixes build failure for me. Thank you!

@r-burns
Copy link
Contributor

r-burns commented Dec 7, 2021

I took a crack at this in #148691 but kept the toplevel VERSION -> VERSION_FULL rename. Is that not needed anymore?

@toonn
Copy link
Contributor Author

toonn commented Dec 7, 2021

@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
Closed
Closed
fabianhjr
fabianhjr approved these changes Dec 9, 2021
View reviewed changes
Copy link
Member

@fabianhjr fabianhjr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Builds and works with digikam

@r-burns
Copy link
Contributor

r-burns commented Dec 9, 2021

Works for me too, let's get this merged :)

@r-burns r-burns merged commit 468dd5a into NixOS:staging-next Dec 9, 2021
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/nix-macos-monthly/12330/14

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fabianhjr fabianhjr fabianhjr approved these changes

@trofi trofi trofi approved these changes

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@toonn @r-burns @nixos-discourse @trofi @fabianhjr