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.

Sign up for GitHub

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

darwin backports #98953

Merged
merged 6 commits into from Sep 27, 2020
Merged

darwin backports #98953

merged 6 commits into from Sep 27, 2020

Conversation

LnL7
Copy link
Member

@LnL7 LnL7 commented Sep 27, 2020

Motivation for this change

Various fixed merged to master since the branchoff. Most notably #97897 awhich fixes part of the last blocker for darwin-tested.

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.

marsam and others added 6 commits September 27, 2020 17:00
@marsam @LnL7
exiv2: fix build on darwin
c3057ea 
(cherry picked from commit de7719a)
@marsam @LnL7
tab: enable on darwin
39c1362 
(cherry picked from commit c193d3b)
@marsam @LnL7
opencv: enable videoio on darwin
77ddb91 
(cherry picked from commit 1966a0a)
@ferranpujolcamins @LnL7
chromaprint: add darwin compatibility
15312d9 
(cherry picked from commit c6dd555)
@zowoq @LnL7
bettercap: build on darwin
9b7d1bf 
(cherry picked from commit 2e30e22)
@afontaine @LnL7
minio: support building on darwin
c6f5321 
Modified build command and flags to allow successful build on Darwin
systems. Based on flags in GitHub issue from minio project [0]

[0]: minio/minio#10188 (comment)

(cherry picked from commit 5e1cb57)
@risicle
Copy link
Contributor

risicle commented Sep 27, 2020

ZHF: #97479

@risicle
Copy link
Contributor

risicle commented Sep 27, 2020

@ofborg build minio

looks like the only linux rebuild.

@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 8.has: clean-up 8.has: package (new) labels Sep 27, 2020
jonringer
jonringer approved these changes Sep 27, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM

Result of nixpkgs-review pr 98953 1

2 packages built:
  • bettercap
  • minio

@jonringer jonringer merged commit 1b01b51 into NixOS:release-20.09 Sep 27, 2020
@binarin
Copy link
Contributor

binarin commented Sep 27, 2020

Incomplete chromaprint change was picked, making it unbuildable on non-darwin. The one finally merged in https://github.com/NixOS/nixpkgs/pull/98057/files doesn't have this problem.

@LnL7
Copy link
Member Author

LnL7 commented Sep 28, 2020

Whoops, I only ran the builds on darwin since there where no conflicts.

@LnL7 LnL7 deleted the darwin-backports branch September 28, 2020 16:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

@basvandijk basvandijk Awaiting requested review from basvandijk

@kalbasit kalbasit Awaiting requested review from kalbasit

@bachp bachp Awaiting requested review from bachp

@edolstra edolstra Awaiting requested review from edolstra

@mdaiter mdaiter Awaiting requested review from mdaiter

@mstarzyk mstarzyk Awaiting requested review from mstarzyk

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

Successfully merging this pull request may close these issues.

None yet
8 participants
@LnL7 @risicle @binarin @jonringer @marsam @ferranpujolcamins @zowoq @afontaine