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

erlangR19: 19.1.6 -> 19.2 #21775

Merged

Conversation

yurrriq
Copy link
Member

@yurrriq yurrriq commented Jan 10, 2017

Motivation for this change

Update erlangR19 from 19.1.6 to 19.2.

N.B. I've added a sw_vers substitution for darwin.

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@yurrriq, thanks for your PR! By analyzing the history of the files in this pull request, we identified @DerTim1, @mdaiter and @dezgeg to be potential reviewers.

@yurrriq yurrriq force-pushed the update/pkgs/development/interpreters/erlang/R19 branch from a990bd9 to 927cb1b Compare January 10, 2017 07:29
Copy link

@DerTim1 DerTim1 left a comment

Choose a reason for hiding this comment

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

On NixOS

@@ -45,6 +45,8 @@ stdenv.mkDerivation rec {

preConfigure = ''
./otp_build autoconf
'' + optionalString stdenv.isDarwin ''
substituteInPlace configure --replace "sw_vers" "/usr/bin/sw_vers"
Copy link
Member

Choose a reason for hiding this comment

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

@LnL7 LGTY?

Copy link
Contributor

Choose a reason for hiding this comment

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

So for me, running the "sw_vers" command without the prepended "/usr/bin/" works perfectly alright. I want to see if NixOS contains this already

Copy link
Contributor

Choose a reason for hiding this comment

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

@grahamc I see it done here

substituteInPlace certbot/util.py --replace "sw_vers" "/usr/bin/sw_vers"
. Must be a Darwin-specific protocol for getting the system version.

Copy link
Member

@LnL7 LnL7 Jan 10, 2017

Choose a reason for hiding this comment

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

yes it's darwin specific, what's this used for? If you can replace the call to the binary with a string would be a better approach.

Copy link
Contributor

Choose a reason for hiding this comment

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

@LnL7 it's used to obtain specific Mac OS version info

Copy link
Member

@LnL7 LnL7 Jan 11, 2017

Choose a reason for hiding this comment

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

I just checked our stdenv sets MACOSX_DEPLOYMENT_TARGET to 10.10, that's probably what we want to use.

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm hacking nix-darwin atm, but I'll give that a go after.

Copy link
Member Author

Choose a reason for hiding this comment

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

Your suggestion worked for me and I've included it in 5bb4d2b, @LnL7. I'd be happy to squash these two commits if y'all prefer.

Copy link
Member

Choose a reason for hiding this comment

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

Yes, please.

Copy link
Member Author

Choose a reason for hiding this comment

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

Rebased and squashed!

@grahamc
Copy link
Member

grahamc commented Jan 10, 2017

Hey, @DerTim1! I appreciate the reviews you've been doing, thank you and keep up the good work!

This change LGTM but just want to get a darwin person (like LnL ) to look at the change. Can you explain what that substitute does?

@DerTim1
Copy link

DerTim1 commented Jan 10, 2017

@grahamc No problem. I thought a build von a linux-system is always useful. :)

@LnL7
Copy link
Member

LnL7 commented Jan 10, 2017

@DerTim1 Definitely! Donating some cpu cycles is always appreciated.

@yurrriq yurrriq force-pushed the update/pkgs/development/interpreters/erlang/R19 branch from 5bb4d2b to 0c4eb07 Compare January 11, 2017 04:49
@yurrriq
Copy link
Member Author

yurrriq commented Jan 11, 2017

Rebased.

Include sw_vers patch as discussed on NixOS#21775.
@yurrriq yurrriq force-pushed the update/pkgs/development/interpreters/erlang/R19 branch from 0c4eb07 to ad3e589 Compare January 11, 2017 07:44
Copy link
Member

@LnL7 LnL7 left a comment

Choose a reason for hiding this comment

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

Looks good now, it's building but it might be some time before I can check the results.

@LnL7 LnL7 merged commit 8ff396a into NixOS:master Jan 11, 2017
@yurrriq yurrriq deleted the update/pkgs/development/interpreters/erlang/R19 branch January 11, 2017 18:24
@LnL7 LnL7 mentioned this pull request Jan 15, 2017
7 tasks
@LnL7 LnL7 mentioned this pull request Apr 21, 2017
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants