Merge pull request #115 from holochain/2019-12-01-nightly-rust

bump rust to nightly 2019-11-25

CHANGELOG-UNRELEASED.md

@@ -8,11 +8,12 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ### Changed
 
+- bump rust to nightly-2019-11-25
+
 ### Deprecated
 
 ### Removed
 
 ### Fixed
 
 ### Security
-

nix-shell/default.nix

@@ -23,7 +23,7 @@
  # rust version through this environment variable.
  # https://github.com/rust-lang/rustup.rs#environment-variables
  # https://github.com/NixOS/nix/issues/903
- RUSTUP_TOOLCHAIN = rust.nightly.version;
+ RUSTUP_TOOLCHAIN = rust.channel.version;
  RUSTFLAGS = rust.compile.flags;
  CARGO_INCREMENTAL = rust.compile.incremental;
  RUST_LOG = rust.log;

rust/config.nix

@@ -6,8 +6,9 @@ let
     # https://rust-lang.github.io/rustup-components-history/
     # read more about version management
     # https://hackmd.io/ShgxFyDVR52gnqK7oQsuiQ
-    nightly = {
-      date = "2019-07-14";
+    channel = {
+      name = "nightly";
+      date = "2019-11-15";
     };
 
     # the target used by rust when compiling wasm
@@ -71,8 +72,8 @@ let
 
   derived = {
 
-    nightly = base.nightly // {
-      version = "nightly-${base.nightly.date}";
+    channel = base.channel // {
+      version = "${base.channel.name}-${base.channel.date}";
     };
 
     compile = base.compile // {

rust/default.nix

@@ -7,7 +7,7 @@ rust //
  buildInputs = []
  # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks/rust.section.md
  ++ [
-  (pkgs.rustChannelOfTargets "nightly" rust.nightly.date [ rust.wasm-target rust.generic-linux-target  ])
+  (pkgs.rustChannelOfTargets rust.channel.name rust.channel.date [ rust.wasm-target rust.generic-linux-target  ])
   pkgs.binutils
   pkgs.gcc
   pkgs.gnumake