Skip to content

webkitgtk: removed now merged patch on darwin#133001

Merged
mweinelt merged 1 commit intoNixOS:masterfrom
sternenseemann:webkitgtk-darwin
Aug 7, 2021
Merged

webkitgtk: removed now merged patch on darwin#133001
mweinelt merged 1 commit intoNixOS:masterfrom
sternenseemann:webkitgtk-darwin

Conversation

@sternenseemann
Copy link
Copy Markdown
Member

@sternenseemann sternenseemann commented Aug 7, 2021 •
edited
Loading

Motivation for this change

Fixes the build; Currently failing with “detected already applied patch” (or whatever the precise error message is).

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.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.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Aug 7, 2021
@sternenseemann sternenseemann mentioned this pull request Aug 7, 2021
Merged
@ofborg ofborg bot requested review from amaxine, dasj19, hedning and jtojnar August 7, 2021 10:56
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Aug 7, 2021
mweinelt
mweinelt approved these changes Aug 7, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@mweinelt mweinelt left a comment

Choose a reason for hiding this comment

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

The ofborg build timedout after 1 hour, but it clearly didn't fail during patch phase.

@sternenseemann
Copy link
Copy Markdown
Member Author

sternenseemann commented Aug 7, 2021

Built it locally to confirm as well!

@mweinelt mweinelt merged commit 1ca057c into NixOS:master Aug 7, 2021
@sternenseemann sternenseemann deleted the webkitgtk-darwin branch August 7, 2021 14:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mweinelt mweinelt mweinelt approved these changes

@hedning hedning Awaiting requested review from hedning

@jtojnar jtojnar Awaiting requested review from jtojnar

@amaxine amaxine Awaiting requested review from amaxine

@dasj19 dasj19 Awaiting requested review from dasj19

Assignees

No one assigned

Labels

6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@sternenseemann @mweinelt