Skip to content

libtiff: get rid of aarch64-darwin.nix#182254

Merged
risicle merged 1 commit intoNixOS:stagingfrom
tanshihaj:libtiff-aarch64-darwin
Jul 30, 2022
Merged

libtiff: get rid of aarch64-darwin.nix#182254
risicle merged 1 commit intoNixOS:stagingfrom
tanshihaj:libtiff-aarch64-darwin

Conversation

@tanshihaj
Copy link
Copy Markdown
Contributor

@tanshihaj tanshihaj commented Jul 20, 2022

Description of changes

I've tried to build libtiff on aarch64-darwin using default.nix and it seems that it builds fine on my mac. Continue of this pr: #181446.

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/)
  • 22.11 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jul 20, 2022
@tanshihaj tanshihaj mentioned this pull request Jul 20, 2022
Closed
13 tasks
@ofborg ofborg bot requested a review from alyssais July 20, 2022 20:19
@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 Jul 20, 2022
@tanshihaj
Copy link
Copy Markdown
Contributor Author

tanshihaj commented Jul 24, 2022

@ajs124 are you happy with this PR? Can we merge it?

ajs124
ajs124 approved these changes Jul 24, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@ajs124 ajs124 left a comment

Choose a reason for hiding this comment

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

diff LGTM, don't have any aarch64-darwin hardware though

@tanshihaj
Copy link
Copy Markdown
Contributor Author

tanshihaj commented Jul 25, 2022

Well, I have one and I checked that it builds. Maybe we will also ask someone to check build on aarch-darwin?

I know only @risicle, he checked this pr: #182367 (comment), maybe he will agree to check also this pr.

@risicle
Copy link
Copy Markdown
Contributor

risicle commented Jul 25, 2022

libtiff.tests reveals no new failures for me on macos 12.4 aarch64, but this will probably need to be rebased to staging (using the technique outlined in https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#rebasing-between-branches-ie-from-master-to-staging). The automatic rebuild counter labels don't seem to assess darwin aarch64, but if they did you'd see this causing >500 rebuilds.

@bobby285271 bobby285271 added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jul 27, 2022
@tanshihaj tanshihaj force-pushed the libtiff-aarch64-darwin branch from 010a691 to 64f69cc Compare July 30, 2022 09:22
@tanshihaj tanshihaj changed the base branch from master to staging July 30, 2022 09:23
@github-actions github-actions bot added 6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 8.has: documentation This PR adds or changes documentation labels Jul 30, 2022
@github-actions github-actions bot added 8.has: module (update) This PR changes an existing module in `nixos/` and removed 6.topic: qt/kde Object-oriented framework for GUI creation 8.has: documentation This PR adds or changes documentation 6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. labels Jul 30, 2022
@tanshihaj
Copy link
Copy Markdown
Contributor Author

tanshihaj commented Jul 30, 2022 •
edited
Loading

@kalbasit @Mic92 @zowoq @ttuegel @matthewbauer @stigtsp @zakame @FRidh @jonringer @fricklerhandwerk @Ericson2314, sorry, I've messed up with rebase, can you remove yourselves as reviewer?

@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 8.has: clean-up This PR removes packages or removes other cruft 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: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 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. and removed 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. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 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: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jul 30, 2022
@risicle risicle merged commit fb0bc98 into NixOS:staging Jul 30, 2022
@fricklerhandwerk fricklerhandwerk removed their request for review August 5, 2022 09:53
@tanshihaj tanshihaj deleted the libtiff-aarch64-darwin branch August 6, 2022 14:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@risicle risicle risicle approved these changes

@ajs124 ajs124 ajs124 approved these changes

@alyssais alyssais Awaiting requested review from alyssais

@kalbasit kalbasit Awaiting requested review from kalbasit

@Mic92 Mic92 Awaiting requested review from Mic92

@zowoq zowoq Awaiting requested review from zowoq

@ttuegel ttuegel Awaiting requested review from ttuegel

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@stigtsp stigtsp Awaiting requested review from stigtsp

@zakame zakame Awaiting requested review from zakame

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

Assignees

No one assigned

Labels

6.topic: darwin Running or building packages on Darwin 8.has: clean-up This PR removes packages or removes other cruft 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. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@tanshihaj @risicle @ajs124 @bobby285271