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

polkadot: 0.2.17 -> 0.8.24 #98785

Merged
merged 2 commits into from Oct 20, 2020
Merged

polkadot: 0.2.17 -> 0.8.24 #98785

merged 2 commits into from Oct 20, 2020

Conversation

@andresilva
Copy link
Member

@andresilva andresilva commented Sep 25, 2020

Motivation for this change
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.
@andresilva andresilva requested a review from mmahut as a code owner Sep 25, 2020
Copy link
Contributor

@bkchr bkchr left a comment

Just build with SKIP_WASM_BUILD=1 and than you don't need nightly.

@jonringer
Copy link
Contributor

@jonringer jonringer commented Sep 25, 2020

akru
akru approved these changes Sep 26, 2020
Copy link
Contributor

@akru akru left a comment

I've built it locally, works well

@ofborg ofborg bot requested a review from akru Sep 26, 2020
@RaghavSood
Copy link
Member

@RaghavSood RaghavSood commented Sep 29, 2020

Just adding in that I've synced a full, archival node to be in sync with the network - works fine

akru
akru approved these changes Sep 29, 2020
@andresilva
Copy link
Member Author

@andresilva andresilva commented Oct 2, 2020

ping

@mmahut
Copy link
Member

@mmahut mmahut commented Oct 3, 2020

@GrahamcOfBorg build polkadot

@FlorianFranzen
Copy link
Contributor

@FlorianFranzen FlorianFranzen commented Oct 4, 2020

@andresilva Very nice for getting this going, I am maintaining a similar derivation here which also builds the wasm runtime. I will give this a review Monday.

@andresilva
Copy link
Member Author

@andresilva andresilva commented Oct 4, 2020

@FlorianFranzen the initial version of this PR was also building the runtime, but this required pulling nightly rustc with wasm environment from Mozilla overlay, and I'm not sure if this would be accepted here. In the end anyone that cares about building the runtime should probably be building from source, this is mostly for regular users that just want to sync the chain.

Copy link
Contributor

@jonringer jonringer left a comment

if https://github.com/paritytech/substrate ever gets a bump to master, this build will fail (cargoDeps hash will change). Please use an immutable source like a commit or tag

@andresilva
Copy link
Member Author

@andresilva andresilva commented Oct 4, 2020

Substrate has had multiple bumps to master since I have opened this PR. The way cargo works is that you define some source for a dependency in the Cargo.toml file and the specific source is fixed in the Cargo.lock file. So even though in the Cargo.toml we are referencing master, the Cargo.lock fixes a specific commit so that everyone builds the same thing every time.

You can have a look at how dependencies are defined in polkadot for example (https://github.com/paritytech/polkadot/blob/master/service/Cargo.toml#L21) where substrate master is also referenced, but the specific commit that they point to is defined in the Cargo.lock.

As far as this PR goes I had to patch one cargo dependency in order to use a more recent version, I did this by pointing a dependency to the git master branch version

+substrate-wasm-builder-runner = { git = "https://github.com/paritytech/substrate", branch = "master" }
in the Cargo.toml file, but the exact commit that will be checked out is defined here
+source = "git+https://github.com/paritytech/substrate#647ad15565d7c35ecf00b73b12cccad9858780b9"
in the Cargo.lock file.

@jonringer
Copy link
Contributor

@jonringer jonringer commented Oct 4, 2020

oh yea, forgot about the lock file nullifying the toml

@andresilva
Copy link
Member Author

@andresilva andresilva commented Oct 11, 2020

ping

@mmahut
Copy link
Member

@mmahut mmahut commented Oct 20, 2020

This looks good, thank you.

@mmahut mmahut merged commit 8dd059e into NixOS:master Oct 20, 2020
21 of 22 checks passed
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

7 participants