Skip to content

_7zz: 22.00 -> 22.01; build on macOS#146010

Merged
thiagokokada merged 3 commits intoNixOS:masterfrom
thiagokokada:build-7zz-macos
Jul 23, 2022
Merged

_7zz: 22.00 -> 22.01; build on macOS#146010
thiagokokada merged 3 commits intoNixOS:masterfrom
thiagokokada:build-7zz-macos

Conversation

@thiagokokada
Copy link
Copy Markdown
Contributor

@thiagokokada thiagokokada commented Nov 14, 2021 •
edited by siraben
Loading

Motivation for this change

Right now it fails on x86_64-darwin with the following error:

../../../Windows/FileDir.cpp:1009:10: error: use of undeclared identifier 'utimensat'
  return utimensat(AT_FDCWD, path, times, flags) == 0

According to this issue, utimensat is only available on macOS SDK 10.13+.

So we probably need to wait until this issue is fixed: #101229

Maybe this works in aarch64-darwin though, since we use a newer SDK for it? If someone is interested to test, you're welcome.

Edit: working fine after the introduction of darwin.apple_sdk_11_0.callPackage, and also some additional patching.

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/)
  • 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.

thiagokokada
thiagokokada commented Nov 14, 2021
View reviewed changes
@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 8.has: package (new) This PR adds a new package labels Nov 14, 2021
@ofborg ofborg bot requested review from anna328p and peterhoeg November 14, 2021 20:05
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Nov 14, 2021
@domenkozar
Copy link
Copy Markdown
Member

domenkozar commented Nov 15, 2021

@ofborg build 7zz

@thiagokokada
Copy link
Copy Markdown
Contributor Author

thiagokokada commented Nov 16, 2021

@ofborg build _7zz

SuperSandro2000
SuperSandro2000 reviewed Nov 16, 2021
View reviewed changes
@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jun 19, 2022
@smancill
Copy link
Copy Markdown
Contributor

smancill commented Jul 23, 2022

Can this maybe be revived now that there is darwin.apple_sdk_11_0?

@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jul 23, 2022
@thiagokokada
Copy link
Copy Markdown
Contributor Author

thiagokokada commented Jul 23, 2022

Can this maybe be revived now that there is darwin.apple_sdk_11_0?

Let me do a rebase and test.

@ofborg ofborg bot requested a review from 06kellyjac July 23, 2022 11:35
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. and removed 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Jul 23, 2022
@thiagokokada thiagokokada marked this pull request as ready for review July 23, 2022 12:53
@thiagokokada
Copy link
Copy Markdown
Contributor Author

thiagokokada commented Jul 23, 2022

Can this maybe be revived now that there is darwin.apple_sdk_11_0?

Done. Tested on my x86_64-darwin system. Would like an input from someone with aarch64-darwin.

Will also test on x86_64-linux later to make sure my changes didn't break it.

@thiagokokada thiagokokada changed the title 7zz: build on macOS _7zz: 22.00 -> 22.01; build on macOS Jul 23, 2022
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. labels Jul 23, 2022
@thiagokokada
Copy link
Copy Markdown
Contributor Author

thiagokokada commented Jul 23, 2022

Result of nixpkgs-review pr 146010 run on x86_64-linux 1

1 package built:
  • _7zz

@thiagokokada
Copy link
Copy Markdown
Contributor Author

thiagokokada commented Jul 23, 2022

Result of nixpkgs-review pr 146010 run on x86_64-darwin 1

1 package built:
  • _7zz

@superherointj
Copy link
Copy Markdown
Contributor

superherointj commented Jul 23, 2022

Result of nixpkgs-review pr 146010 run on x86_64-linux 1

1 package built:
  • _7zz

@siraben
Copy link
Copy Markdown
Member

siraben commented Jul 23, 2022

Result of nixpkgs-review pr 146010 run on aarch64-darwin 1

1 package built:
  • _7zz

@thiagokokada thiagokokada merged commit 6e52e64 into NixOS:master Jul 23, 2022
@thiagokokada thiagokokada deleted the build-7zz-macos branch July 23, 2022 22:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@siraben siraben siraben approved these changes

@anna328p anna328p Awaiting requested review from anna328p

@peterhoeg peterhoeg Awaiting requested review from peterhoeg

@06kellyjac 06kellyjac Awaiting requested review from 06kellyjac

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

Assignees

No one assigned

Labels

6.topic: darwin Running or building packages on Darwin 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Update macOS SDK

7 participants

@thiagokokada @domenkozar @smancill @superherointj @siraben @peterhoeg @SuperSandro2000