Skip to content

Comments

mariadb: unlink withNuma from withEmbedded#215334

Merged
ajs124 merged 1 commit intoNixOS:stagingfrom
superherointj:pkg-mariadb-remove-flag-withEmbedded
Feb 15, 2023
Merged

mariadb: unlink withNuma from withEmbedded#215334
ajs124 merged 1 commit intoNixOS:stagingfrom
superherointj:pkg-mariadb-remove-flag-withEmbedded

Conversation

@superherointj
Copy link
Contributor

@superherointj superherointj commented Feb 8, 2023

mariadb: unlink withNuma from withEmbedded

This PR targets staging because it would conflict in staging if targeted master. (Another staging PR changed same parts of file.)

@superherointj superherointj marked this pull request as draft February 8, 2023 16:24
@superherointj superherointj removed the request for review from SuperSandro2000 February 8, 2023 16:25
@ajs124
Copy link
Member

ajs124 commented Feb 8, 2023

this is used in nixpkgs by amarok since #195644, so we can't easily get rid of this

@superherointj superherointj changed the title mariadb: remove flag withEmbedded for deprecation mariadb: make withNuma unrelated to withEmbedded Feb 8, 2023
@superherointj superherointj marked this pull request as ready for review February 8, 2023 16:34
@superherointj
Copy link
Contributor Author

superherointj commented Feb 8, 2023

this is used in nixpkgs by amarok since #195644, so we can't easily get rid of this

Thanks. Won't change.

As NUMA is unrelated to embedded. I'm repurposing PR to reflect it.
https://dev.mysql.com/doc/refman/8.0/en/source-configuration-options.html#option_cmake_with_numa

@superherointj superherointj changed the title mariadb: make withNuma unrelated to withEmbedded mariadb: unlink withNuma from withEmbedded Feb 8, 2023
@superherointj superherointj requested a review from ajs124 February 8, 2023 16:50
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Feb 8, 2023
@superherointj
Copy link
Contributor Author

@ajs124 Can you review/approve this?

@ajs124
Copy link
Member

ajs124 commented Feb 15, 2023

forgot about this, sorry. can't this go to master?

@superherointj
Copy link
Contributor Author

superherointj commented Feb 15, 2023

forgot about this,

No worry. Btw, thanks for reviewing!

sorry. can't this go to master?

Last time I checked, it would create a merge conflict in staging, unless maria PR (#214981) is already at master. (which seems to not be yet). See tracker: https://nixpk.gs/pr-tracker.html?pr=214981

Cherry-picking 616d1877e39d516d32a3379c197d67d712388072 to staging causes no conflict.
Cherry-picking to master causes conflict that would have to be manually solved (in staging) by whoever is doing the syncing between staging/staging-next/master.

IMO this should be merged to staging to avoid a conflict and lessen work for whoever is doing syncing between staging/master branches in nixpkgs.

@ajs124 ajs124 merged commit a3982d4 into NixOS:staging Feb 15, 2023
@superherointj superherointj deleted the pkg-mariadb-remove-flag-withEmbedded branch February 15, 2023 15:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants