Skip to content

Revert "treewide: change wafConfigureFlags to configureFlags"#254111

Closed
fabianhjr wants to merge 1 commit intoNixOS:staging-nextfrom
LibreCybernetics:revert-waf-staging-next
Closed

Revert "treewide: change wafConfigureFlags to configureFlags"#254111
fabianhjr wants to merge 1 commit intoNixOS:staging-nextfrom
LibreCybernetics:revert-waf-staging-next

Conversation

@fabianhjr
Copy link
Copy Markdown
Member

This reverts commit 9f52275.

Caused breakage on staging-next (2023-09-07) due to the following error:

waf: error: no such option: --sbindir

Reverted on staging after the cut, refer to #252874

#253854

Description of changes

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/)
  • 23.11 Release Notes (or backporting 23.05 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
  • Fits CONTRIBUTING.md.

This reverts commit 9f52275.

Caused breakage on staging-next (2023-09-07) due to the following error:

```
waf: error: no such option: --sbindir
```

Reverted on staging after the cut, refer to NixOS#252874
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. labels Sep 8, 2023
@Artturin
Copy link
Copy Markdown
Member

Artturin commented Sep 8, 2023

You should merge the revert commit from staging to staging-next

@Artturin
Copy link
Copy Markdown
Member

Artturin commented Sep 8, 2023

@Mic92 did such a merge for me once e1b1a25

@fabianhjr
Copy link
Copy Markdown
Member Author

Changing to draft to avoid merge.

@fabianhjr fabianhjr marked this pull request as draft September 8, 2023 23:01
@fabianhjr
Copy link
Copy Markdown
Member Author

This applies mostly cleanly on staging, except for a rename.

I'm not sure a commit exists such that a conflict won't emerge. :s

@fabianhjr fabianhjr closed this Sep 9, 2023
@fabianhjr fabianhjr deleted the revert-waf-staging-next branch September 9, 2023 03:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants