Skip to content

[staging-next] mariadb: fix build#148691

Closed
r-burns wants to merge 1 commit intoNixOS:staging-nextfrom
r-burns:mariadb
Closed

[staging-next] mariadb: fix build#148691
r-burns wants to merge 1 commit intoNixOS:staging-nextfrom
r-burns:mariadb

Conversation

@r-burns
Copy link
Copy Markdown
Contributor

@r-burns r-burns commented Dec 5, 2021 •
edited
Loading

The 'storage/mroonga/version' file was renamed upstream in mariadb 10.6.4,
so we no longer need to rename it ourselves.

MariaDB/server@65e3d08

Motivation for this change

#148396

https://hydra.nixos.org/build/160558690/nixlog/1

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.

@r-burns
mariadb: fix build
1775a4f 
The 'storage/mroonga/version' file was renamed upstream in mariadb 10.6.4,
so we no longer need to rename it ourselves.

MariaDB/server@65e3d08
@ofborg ofborg bot requested a review from thoughtpolice December 5, 2021 10:39
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Dec 5, 2021
@r-burns r-burns mentioned this pull request Dec 7, 2021
Merged
13 tasks
@r-burns
Copy link
Copy Markdown
Contributor Author

r-burns commented Dec 7, 2021

Closing in favor of #149096

@r-burns r-burns closed this Dec 7, 2021
@r-burns r-burns deleted the mariadb branch December 7, 2021 19:08
@r-burns r-burns mentioned this pull request Dec 9, 2021
Closed
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

Assignees

No one assigned

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@r-burns