Skip to content

Comments

bintools-wrapper: remove redundant arg #103053

Merged
zowoq merged 2 commits intoNixOS:stagingfrom
zowoq:sigh
Nov 13, 2020
Merged

bintools-wrapper: remove redundant arg #103053
zowoq merged 2 commits intoNixOS:stagingfrom
zowoq:sigh

Conversation

@zowoq
Copy link
Contributor

@zowoq zowoq commented Nov 7, 2020

Motivation for this change

Fix #101330

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.

zowoq added 2 commits November 7, 2020 14:57
@zowoq
bintools-wrapper: remove redundant arg
764b227 
cctools 949.0.1 warns if min version is passed twice.
@zowoq
Revert "ruby: fix build on darwin"
a6acf9a 
This reverts commit d73cc1e.
@zowoq zowoq requested a review from alyssais as a code owner November 7, 2020 05:00
@zowoq zowoq mentioned this pull request Nov 7, 2020
Closed
@ofborg ofborg bot added the 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. label Nov 7, 2020
@r-burns
Copy link
Contributor

r-burns commented Nov 7, 2020

I think #101602 can now be reverted as well

@zowoq
Copy link
Contributor Author

zowoq commented Nov 7, 2020

I think #101602 can now be reverted as well

Yeah, I'll do that after this lands in master so it doesn't interfere the workflow on the haskell-updates branch.

@ofborg ofborg bot added the 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. label Nov 7, 2020
@ofborg ofborg bot requested review from manveru, marsam and vrthra November 7, 2020 05:10
@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 Nov 7, 2020
r-burns
r-burns approved these changes Nov 7, 2020
View reviewed changes
Copy link
Contributor

@r-burns r-burns left a comment

Choose a reason for hiding this comment

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

Rebuilt stdenv + affected packages a couple weeks ago, worked for me #101330 (comment)

@thefloweringash thefloweringash mentioned this pull request Nov 9, 2020
Merged
14 tasks
@zowoq zowoq merged commit 051812b into NixOS:staging Nov 13, 2020
@zowoq zowoq deleted the sigh branch November 13, 2020 21:11
marsam
marsam reviewed Nov 13, 2020
View reviewed changes
Copy link
Contributor

@marsam marsam left a comment

Choose a reason for hiding this comment

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

Sorry I'm late. LGTM, thanks!.
Reading the git history about this flag, seem to be okay to remove it:

The -macosx_version_min flag isn't strictly necessary since that's already handled by MACOSX_DEPLOYMENT_TARGET.
a826b49

the compiler always adds the flag [-macos_version_min] based on the variable [MACOSX_DEPLOYMENT_TARGET], overriding this original one, it's not really necessary. Added it just in case but should be fine to leave out if you're concerned about it. #77632 (comment)

@uri-canva
Copy link
Contributor

uri-canva commented Dec 3, 2020

I think this broke bazel on darwin: #105439

@uri-canva
Copy link
Contributor

uri-canva commented Dec 3, 2020

Verified reverting this fixes both bazel and libmodplug, which are currently broken on master. It's possible other packages are affected too.

@avdv
Copy link
Member

avdv commented Dec 4, 2020

I have created #105573 to track this down.

@bobrik bobrik mentioned this pull request Dec 26, 2020
Merged
21 tasks
@thefloweringash thefloweringash mentioned this pull request Feb 5, 2021
Merged
14 tasks
@Gabriella439 Gabriella439 mentioned this pull request May 3, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@r-burns r-burns r-burns approved these changes

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@LnL7 LnL7 Awaiting requested review from LnL7

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@alyssais alyssais Awaiting requested review from alyssais

@vrthra vrthra Awaiting requested review from vrthra

@manveru manveru Awaiting requested review from manveru

+1 more reviewer

@marsam marsam marsam left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 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-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 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.

5 participants

@zowoq @r-burns @uri-canva @avdv @marsam