Skip to content

cairo: enable tee unconditionally#128297

Merged
mweinelt merged 1 commit intoNixOS:stagingfrom
sternenseemann:cairo-unconditional-tee
Jun 27, 2021
Merged

cairo: enable tee unconditionally#128297
mweinelt merged 1 commit intoNixOS:stagingfrom
sternenseemann:cairo-unconditional-tee

Conversation

@sternenseemann
Copy link
Copy Markdown
Member

@sternenseemann sternenseemann commented Jun 27, 2021

The pycairo test suite fails on darwin because cairo's tee backend is
not enabled: pygobject/pycairo#238
Since cairo builds on darwin fine with tee, there seems to be no
reason not to enable it.

Motivation for this change
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 pkgs 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 Relase 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.

@sternenseemann
cairo: enable tee unconditionally
6102c4a 
The pycairo test suite fails on darwin because cairo's tee backend is
not enabled: pygobject/pycairo#238
Since cairo builds on darwin fine with tee, there seems to be no
reason not to enable it.
@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: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jun 27, 2021
@sternenseemann
Copy link
Copy Markdown
Member Author

sternenseemann commented Jun 27, 2021

pycairo on darwin:

$ nix-build -A python3Packages.pycairo
/nix/store/ji9vdvdf4acrcw1pznz40f5dwa3nx65i-python3.8-pycairo-1.20.1

@mweinelt mweinelt linked an issue Jun 27, 2021 that may be closed by this pull request
python3Packages.pycairo is broken on darwin #128266
Closed
@sternenseemann sternenseemann changed the base branch from master to staging June 27, 2021 11:12
@mweinelt mweinelt merged commit 07dead5 into NixOS:staging Jun 27, 2021
@sternenseemann sternenseemann deleted the cairo-unconditional-tee branch June 27, 2021 12:19
@jonringer
Copy link
Copy Markdown
Contributor

jonringer commented Jun 27, 2021

This probably should have targeted staging-next. As it was addressing a regression in staging-next

@sternenseemann
Copy link
Copy Markdown
Member Author

sternenseemann commented Jun 27, 2021

There was no staging-next PR at the time of merging…

@jonringer
Copy link
Copy Markdown
Contributor

jonringer commented Jun 27, 2021

oh right, sorry. Was looking at hydra job. You're good :)

@sternenseemann sternenseemann restored the cairo-unconditional-tee branch July 24, 2021 13:36
siraben added a commit to siraben/dotfiles that referenced this pull request Aug 17, 2021
@siraben
home.nix: Changes
0e45568 
- Revert back to nix-gccemacs-darwin until I upgrade to Big Sur
- Comment out rmview until NixOS/nixpkgs#128297 is in master
- Update niv sources
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

Assignees

No one assigned

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 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.

python3Packages.pycairo is broken on darwin

4 participants

@sternenseemann @jonringer @mweinelt @nixos-discourse