Skip to content

spandsp: refactor#218480

Merged
7c6f434c merged 1 commit intostagingfrom
unknown repository
Mar 10, 2023
Merged

spandsp: refactor#218480
7c6f434c merged 1 commit intostagingfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Feb 26, 2023

Includes (to avoid merge conflict):

Description of changes

The spandsp derivation has the clauses in the wrong order (e.g. makeFlags before configureFlags) which makes it hard to understand.

This commit fixes the clause order, factors out common.nix from the two versions of spandsp, and also tries to normalize the coding style.

CC: @SuperSandro2000 for review

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux

@ghost ghost marked this pull request as draft February 26, 2023 17:46
@alyssais alyssais mentioned this pull request Feb 26, 2023
1 task
@ofborg ofborg bot requested a review from 7c6f434c February 26, 2023 18:15
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. labels Feb 26, 2023
@ghost ghost changed the title spandsp: reformat spandsp: refactor Feb 26, 2023
@ghost ghost marked this pull request as ready for review February 26, 2023 18:18
@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Feb 26, 2023
@ofborg ofborg bot requested review from ajs124 and misuzu February 26, 2023 18:59
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. labels Feb 26, 2023
Copy link
Copy Markdown
Contributor

@misuzu misuzu left a comment

Choose a reason for hiding this comment

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

LGTM! This should probably go to the staging though

@figsoda figsoda added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Mar 2, 2023
@ghost ghost marked this pull request as draft March 7, 2023 09:49
@ghost ghost changed the base branch from master to staging March 7, 2023 09:49
@ghost ghost marked this pull request as ready for review March 7, 2023 09:54
@ghost ghost requested review from misuzu and removed request for 7c6f434c and ajs124 March 7, 2023 09:55
@ofborg ofborg bot requested a review from ajs124 March 7, 2023 11:33
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. and removed 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. labels Mar 7, 2023
@7c6f434c
Copy link
Copy Markdown
Member

7c6f434c commented Mar 9, 2023

Wait, it includes the changes, but not the commits? I merged in the wrong order, I guess, but I thought it would work if this PR includes those?

The `spandsp` derivation has the clauses in the wrong order
(e.g. `makeFlags` before `configureFlags`) which makes it hard to
understand.

This commit fixes the clause order, factors out `common.nix` from
the two versions of spandsp, and also tries to normalize the coding
style.
@ghost ghost marked this pull request as draft March 10, 2023 05:47
@ghost ghost marked this pull request as ready for review March 10, 2023 05:47
@ghost
Copy link
Copy Markdown
Author

ghost commented Mar 10, 2023

Wait, it includes the changes, but not the commits? I merged in the wrong order, I guess, but I thought it would work if this PR includes those?

#218477 got some suggested changes which I forgot to backport into this PR.

It's rebased now.

@ofborg ofborg bot requested a review from misuzu March 10, 2023 06:06
@ofborg ofborg bot added 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. and removed 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. labels Mar 10, 2023
@7c6f434c 7c6f434c merged commit ad02b6f into NixOS:staging Mar 10, 2023
@ghost ghost deleted the pr/spandsp/style branch March 10, 2023 09:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: package (new) This PR adds a new package 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants