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

bs-platform: fix build on aarch64 #79106

Merged
merged 1 commit into from Feb 10, 2020

Conversation

@anmonteiro
Copy link
Member

@anmonteiro anmonteiro commented Feb 2, 2020

Motivation for this change

rescript-lang/rescript-compiler#4139

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.

cc @turboMaCk

configurePhase = ''
node scripts/ninja.js config
'';
dontConfigure = true;

This comment has been minimized.

@anmonteiro

anmonteiro Feb 2, 2020
Author Member

I tracked down the issue that @bobzhang referred to in this comment.

Apparently running node scripts/ninja.js config will cause the build script to build the development version.

@anmonteiro
Copy link
Member Author

@anmonteiro anmonteiro commented Feb 2, 2020

Looks like we can build bs-platform on aarch64 again. Thanks for your help @bobzhang!

Copy link
Contributor

@jonringer jonringer left a comment

commit msg should be:

bs-platform: 7.0.1 -> 7.1.0
@anmonteiro anmonteiro force-pushed the anmonteiro:anmonteiro/bs-platform-7.1.0 branch from eba938f to be76781 Feb 2, 2020
@anmonteiro anmonteiro changed the title bs-platform: bump to 7.1.0 bs-platform: 7.0.1 -> 7.1.0 Feb 2, 2020
@anmonteiro
Copy link
Member Author

@anmonteiro anmonteiro commented Feb 2, 2020

Thanks, updated

rev = "52770839e293ade2bcf187f2639000ca0a9a1d46";
sha256 = "0s7g2zfhshsilv9zyp0246bypg34d294z27alpwz03ws9608yr7k";
rev = "a7f482243fabb38292b81b7bae9cefcb8076237f";
sha256 = "0p0ywb4cjpsrjq0if4s1bsnv9jdycd61r4ryndfzc50gngrpjbqr";

This comment has been minimized.

@turboMaCk

turboMaCk Feb 3, 2020
Member

this fails for me:

fatal: reference is not a tree: a7f482243fabb38292b81b7bae9cefcb8076237f
Unable to checkout a7f482243fabb38292b81b7bae9cefcb8076237f from https://github.com/BuckleScript/bucklescript.git.
@turboMaCk
Copy link
Member

@turboMaCk turboMaCk commented Feb 3, 2020

@anmonteiro 7.1.0 seems not to be released. Further more git commits of development version are changing so referencing those commits is not safe. We need to wait for the official release of 7.1.0 and commit that will stay in the master.

Copy link
Member

@turboMaCk turboMaCk left a comment

wait for 7.1.0 release

Copy link
Member

@turboMaCk turboMaCk left a comment

I recommend leaving bump of version out from this and merging it as a fix for arm build. If you chose to do so please change the commit message. @jonringer 's suggested name follows convention in case of updates but not if we leave it out.

@@ -4,14 +4,14 @@ let
in
(build-bs-platform {
inherit stdenv runCommand fetchFromGitHub ninja nodejs python3;
version = "7.0.1";
version = "7.1.0";

This comment has been minimized.

@turboMaCk

turboMaCk Feb 3, 2020
Member

revert version bump:

Suggested change
version = "7.1.0";
version = "7.0.1";
ocaml-version = "4.06.1";

src = fetchFromGitHub {
owner = "BuckleScript";
repo = "bucklescript";
rev = "52770839e293ade2bcf187f2639000ca0a9a1d46";
sha256 = "0s7g2zfhshsilv9zyp0246bypg34d294z27alpwz03ws9608yr7k";
rev = "a7f482243fabb38292b81b7bae9cefcb8076237f";

This comment has been minimized.

@turboMaCk

turboMaCk Feb 3, 2020
Member

revert to old commit:

Suggested change
rev = "a7f482243fabb38292b81b7bae9cefcb8076237f";
rev = "52770839e293ade2bcf187f2639000ca0a9a1d46";
rev = "52770839e293ade2bcf187f2639000ca0a9a1d46";
sha256 = "0s7g2zfhshsilv9zyp0246bypg34d294z27alpwz03ws9608yr7k";
rev = "a7f482243fabb38292b81b7bae9cefcb8076237f";
sha256 = "0p0ywb4cjpsrjq0if4s1bsnv9jdycd61r4ryndfzc50gngrpjbqr";

This comment has been minimized.

@turboMaCk

turboMaCk Feb 3, 2020
Member

revert checksum:

Suggested change
sha256 = "0p0ywb4cjpsrjq0if4s1bsnv9jdycd61r4ryndfzc50gngrpjbqr";
sha256 = "0s7g2zfhshsilv9zyp0246bypg34d294z27alpwz03ws9608yr7k";
@anmonteiro anmonteiro force-pushed the anmonteiro:anmonteiro/bs-platform-7.1.0 branch from be76781 to 642e62e Feb 3, 2020
@anmonteiro anmonteiro changed the title bs-platform: 7.0.1 -> 7.1.0 bs-platform: fix build on aarch64 Feb 3, 2020
Copy link
Member

@turboMaCk turboMaCk left a comment

LGTM thanks

@ofborg ofborg bot requested a review from turboMaCk Feb 3, 2020
@ofborg ofborg bot requested a review from turboMaCk Feb 4, 2020
@turboMaCk
Copy link
Member

@turboMaCk turboMaCk commented Feb 7, 2020

@anmonteiro can you please rebase and sqush commits in here? It seems to me that once that's done we can start pushing for merge.

Co-Authored-By: Jon <jonringer@users.noreply.github.com>
@anmonteiro anmonteiro force-pushed the anmonteiro:anmonteiro/bs-platform-7.1.0 branch from 592fa02 to 56dcbc3 Feb 7, 2020
@anmonteiro
Copy link
Member Author

@anmonteiro anmonteiro commented Feb 7, 2020

Squashed!

@marsam marsam merged commit aaa8fe2 into NixOS:master Feb 10, 2020
15 checks passed
15 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
bs-platform on aarch64-linux Success
Details
bs-platform on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@marsam
Copy link
Contributor

@marsam marsam commented Feb 10, 2020

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.