Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

topgrade: fix, add darwin Foundation framework #77700

Merged
merged 2 commits into from Jan 17, 2020
Merged

topgrade: fix, add darwin Foundation framework #77700

merged 2 commits into from Jan 17, 2020

Conversation

HugoReeves
Copy link
Member

Motivation for this change

Resolves an issue introduced at #77250
The issue is caused by a new dependency in topgrade that relies on the Darwin Foundation framework. This PR resolves the issue, allowing topgrade to build once again on Darwin.
Closer attention needs to be paid to testing builds on MacOS as breaks like this are avoidable. Maybe maintainers should find MacOS users to help maintain/test each PR. @filalex77 if you would like a Darwin tester for topgrade related PR's to nixpkgs, I am available.

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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jan 14, 2020
@ofborg ofborg bot requested a review from Br1ght0ne January 14, 2020 21:29
@Br1ght0ne
Copy link
Member

Thanks a lot @HugoReeves! I don't have any Darwin machine available, so I would appreciate your help with testing. Feel free to add yourself as a maintainer so you will be notified on new PRs.

Br1ght0ne
Br1ght0ne approved these changes Jan 15, 2020
View reviewed changes
Copy link
Member

@Br1ght0ne Br1ght0ne left a comment

Choose a reason for hiding this comment

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

also, LGTM

@ofborg ofborg bot requested review from kalbasit and Br1ght0ne January 15, 2020 21:25
@kalbasit
Copy link
Member

Can you please combine commit 04d3c3272bcf29ad15aa61632c0180f81a9c9807 into 32d4a447c109d19e5faf2c506524d2a850258744?

@HugoReeves
Copy link
Member Author

Done.

63231400a31 topgrade: add maintainer, hugoreeves
fdff4f7c79e topgrade: fix, add darwin Foundation framework

Br1ght0ne
Br1ght0ne reviewed Jan 16, 2020
View reviewed changes
Copy link
Member

@Br1ght0ne Br1ght0ne left a comment

Choose a reason for hiding this comment

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

Besides some nitpicks, LGTM. Thanks!

pkgs/tools/misc/topgrade/default.nix Outdated Show resolved Hide resolved
pkgs/tools/misc/topgrade/default.nix Outdated Show resolved Hide resolved
@HugoReeves
Copy link
Member Author

Should be ready to merge, new git log --online -n 2 result.

212e7ea2f18 topgrade: add maintainer, hugoreeves
8bef4113cef topgrade: fix, add darwin Foundation framework

@ofborg ofborg bot requested a review from Br1ght0ne January 16, 2020 18:28
@kalbasit
Copy link
Member

@GrahamcOfBorg build topgrade

@kalbasit kalbasit merged commit 2628f20 into NixOS:master Jan 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kalbasit kalbasit kalbasit approved these changes

@Br1ght0ne Br1ght0ne Awaiting requested review from Br1ght0ne

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 0 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@HugoReeves @Br1ght0ne @kalbasit