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

smlnjBootstrap: 110.84 -> 110.91 #57916

Merged
merged 1 commit into from Aug 4, 2019

Conversation

vaibhavsagar
Copy link
Member

@vaibhavsagar vaibhavsagar commented Mar 19, 2019

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@vaibhavsagar
Copy link
Member Author

@jwiegley does this look good?

@xeji
Copy link
Contributor

xeji commented Apr 8, 2019

@GrahamcOfBorg build smlnjBootstrap

Copy link
Contributor

@xeji xeji left a comment

Choose a reason for hiding this comment

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

doesn't build

@aanderse
Copy link
Member

@vaibhavsagar are you able to address the build failure?

/nix/store/4ixxl0jdcq0zz7xbzmrqg2cpg1wpsi63-stdenv-darwin/setup: line 1317: /usr/bin/xar: Operation not permitted

@vaibhavsagar
Copy link
Member Author

Unfortunately I don't have access to a Mac.

@aanderse
Copy link
Member

@vaibhavsagar alright thanks.

@nixos-discourse
Copy link

This pull request has been mentioned on Nix community. There might be relevant details there:

https://discourse.nixos.org/t/prs-in-distress/3604/1

@lilyball
Copy link
Member

lilyball commented Aug 3, 2019

I have to assume the build failure is due to sandboxing preventing access to /usr/bin/xar.

@lilyball
Copy link
Member

lilyball commented Aug 3, 2019

The following appears to fix this for me:

diff --git a/pkgs/development/compilers/smlnj/bootstrap.nix b/pkgs/development/compilers/smlnj/bootstrap.nix
index 2315ae28431..28f65d3ad9d 100644
--- a/pkgs/development/compilers/smlnj/bootstrap.nix
+++ b/pkgs/development/compilers/smlnj/bootstrap.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cpio, rsync, makeWrapper }:
+{ stdenv, fetchurl, cpio, rsync, xar, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "smlnj-bootstrap-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ cpio rsync makeWrapper ];
 
   unpackPhase = ''
-    /usr/bin/xar -xf $src
+    ${xar}/bin/xar -xf $src
     cd smlnj.pkg
   '';
 

@vaibhavsagar
Copy link
Member Author

Thanks @lilyball!

@lilyball
Copy link
Member

lilyball commented Aug 4, 2019

@vaibhavsagar I believe nixpkgs guidelines says you should squash the two commits together.

@vaibhavsagar
Copy link
Member Author

vaibhavsagar commented Aug 4, 2019

I went ahead and did this, but I don't see it in the guidelines as it's not a typo or whitespace-only change: https://nixos.org/nixpkgs/manual/#submitting-changes-making-patches.

@aanderse
Copy link
Member

aanderse commented Aug 4, 2019

@GrahamcOfBorg build smlnjBootstrap

Thanks for your never ending awesomeness @lilyball!

@aanderse
Copy link
Member

aanderse commented Aug 4, 2019

@vaibhavsagar Oops... it appears this has sat long enough it is out of date. Maybe you should rename this PR and rewrite thebump commit to the newest version.

@vaibhavsagar vaibhavsagar changed the title smlnjBootstrap: 110.84 -> 110.85 smlnjBootstrap: 110.84 -> 110.91 Aug 4, 2019
@vaibhavsagar
Copy link
Member Author

@aanderse updated.

@aanderse
Copy link
Member

aanderse commented Aug 4, 2019

@GrahamcOfBorg build smlnjBootstrap

Copy link
Member

@aanderse aanderse left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@aanderse aanderse merged commit 4b5b41a into NixOS:master Aug 4, 2019
@vaibhavsagar vaibhavsagar deleted the bump-smlnjBootstrap branch August 5, 2019 02:01
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

7 participants