Merge branch 'develop' of https://github.com/holochain/holonix into r…

…sm_release
holochain · Sep 10, 2020 · 8c3edb9 · 8c3edb9
2 parents 8cca456 + ec78359
commit 8c3edb9
Show file tree

Hide file tree

Showing 29 changed files with 8,369 additions and 54 deletions.
diff --git a/.cargo/.crates.toml b/.cargo/.crates.toml
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -31,6 +31,7 @@ jobs:
 
    # run shell tests
    - run: nix-shell --run hn-test
+   - run: nix-shell --run hn-test --arg use-stable-rust true
 
  debian:
   docker:
@@ -44,6 +45,7 @@ jobs:
        nix-shell --run echo
        ./test/nix-env.sh
        nix-shell --run hn-test
+       nix-shell --run hn-test --arg use-stable-rust true
 
  ubuntu:
   docker:
@@ -57,6 +59,7 @@ jobs:
        nix-shell --run echo
        ./test/nix-env.sh
        nix-shell --run hn-test
+       nix-shell --run hn-test --arg use-stable-rust true
 
  # THIS IS SECURITY SENSITVE
  # READ THESE
@@ -85,11 +88,12 @@ jobs:
    - run:
       name: Standard tests
       command: |
-       curl https://nixos.org/nix/install | sh
+       sh <(curl -L https://nixos.org/nix/install)
        . /Users/distiller/.nix-profile/etc/profile.d/nix.sh
        nix-shell --run echo
        ./test/nix-env.sh
        nix-shell --run hn-test
+       nix-shell --run hn-test --arg use-stable-rust true
 
  docker-build-latest:
   resource_class: large

diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ result
 Cargo.lock
 target
 .DS_Store
+tmp
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,161 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.0.82] - 2020-08-28
+
+### Added
+
+### Changed
+
+- pinned the stable version of rust
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Security
+
+## [0.0.81] - 2020-07-31
+
+### Added
+
+### Changed
+- Updated to holochain v0.0.51-alpha1
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Security
+
+## [0.0.80] - 2020-07-14
+
+### Added
+
+### Changed
+- Updated to holochain v0.0.50-alpha4
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Security
+
+## [0.0.79] - 2020-06-25
+
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Security
+
+## [0.0.78] - 2020-06-25
+
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+* CI scripts involving Nix installation fixed for Nix installer 2.3.6
+
+### Security
+
+## [0.0.77] - 2020-06-25
+
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Security
+
+## [0.0.76] - 2020-06-25
+
+### Added
+- hc-happ-scaffold command
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Security
+
+## [0.0.75] - 2020-05-28
+
+### Added
+
+### Changed
+- Updated to holochain v0.0.49-alpha1
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Security
+
+## [0.0.74] - 2020-05-14
+
+### Added
+
+- rust: introduce use-stable-rust config variable
+
+### Changed
+
+- Updated to holochain v0.0.48-alpha1
+- nix-shell: use bash from nixpkgs explicitly
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Security
+
+## [0.0.73] - 2020-04-09
+
+### Added
+
+### Changed
+
+- Updated to holochain v0.0.47-alpha1
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Security
+
 ## [0.0.72] - 2020-03-27
 
 ### Added

diff --git a/default.nix b/default.nix
@@ -5,14 +5,18 @@
 {
  # allow consumers to pass in their own config
  # fallback to empty sets
- config ? import ./config.nix
+ config ? import ./config.nix,
+ use-stable-rust ? false
 }:
 let
  pkgs = import ./nixpkgs;
 
  aws = pkgs.callPackage ./aws { };
  darwin = pkgs.callPackage ./darwin { };
- rust = pkgs.callPackage ./rust { };
+ rust = pkgs.callPackage ./rust {
+  config = config // { holonix.use-stable-rust = use-stable-rust; };
+ };
+
  node = pkgs.callPackage ./node { };
  git = pkgs.callPackage ./git { };
  linux = pkgs.callPackage ./linux { };
@@ -31,6 +35,7 @@ let
  };
  test = pkgs.callPackage ./test {
    pkgs = pkgs;
+   config = { holonix.use-stable-rust = use-stable-rust; };
  };
 
  holonix-shell = pkgs.callPackage ./nix-shell {

diff --git a/dist/cli/config.nix b/dist/cli/config.nix
@@ -1,10 +1,10 @@
 {
- name = "cli";
+  name = "cli";
 
- sha256 = {
-  linux = "1g24npkwh6hqham3lbzvx1akjsfclfz7brbzysjpbqi3dg823jnb";
-  darwin = "0m4d2b4fkvcl71zd7v4hfig5y02ncfjnfg35pbswfgq0vp3ycd27";
- };
+  sha256 = {
+   linux = "10wcwz5ns2nx9bcmpphdah1jmczmk59ggq9qjbd7wmc1jqh2bni1";
+   darwin = "003cczrl5xbxiyyclr5b4vx5i6hc64xbrpdh6mcy79njzzxizqa3";
+  };
 
- binary = "hc";
+  binary = "hc";
 }
diff --git a/dist/config.nix b/dist/config.nix
@@ -1,7 +1,7 @@
 {
 
  path = "dist";
- version = "v0.0.46-alpha1";
+ version = "v0.0.51-alpha1";
 
  github = rec {
   user = "holochain";

diff --git a/dist/holochain/config.nix b/dist/holochain/config.nix
@@ -1,12 +1,12 @@
 {
- name = "holochain";
+  name = "holochain";
 
- sha256 = {
-  linux = "0zc0p1wp7cfzj00v1g0rhj9skps8a0cip4f89j9kiram2f5gspc9";
-  darwin = "0s3h0hsi3l4ig8bkf3lw5zwgh71c8m79wyfaa6i8nhczbrsympmm";
- };
+  sha256 = {
+    linux = "1a8ys44piz9mcrsa4zlpf6f1g7nz1v6lxz2vifbw949hh9mkknjk";
+    darwin = "1h440najl1wgs37bxdk2a823yfixhs1z9ywzgavl9s6ay2y55j5n";
+  };
 
- binary = "holochain";
+  binary = "holochain";
 
- deps = [];
+  deps = [];
 }
diff --git a/dist/sim2h_server/config.nix b/dist/sim2h_server/config.nix
@@ -1,12 +1,12 @@
 {
- name = "sim2h_server";
+  name = "sim2h_server";
 
- sha256 = {
-  linux = "1n4qilya8gj77z8vlxbvajjl304hz7mjaxgdbwvybkiaqmyd1df0";
-  darwin = "1kd0hh5x4r99mpx7wdsmdza16xd6qspiwdjq27vl84hmg5d28n77";
- };
+  sha256 = {
+    linux = "0yh187s0irxq5wj33ql203498g1yvw6k1nmpg0w3rb1h7zzdzizc";
+    darwin = "0vsj6bv10pmramdx97hwhl0c45ij8d1gay320029p4sjy7qpki56";
+  };
 
- binary = "sim2h_server";
+  binary = "sim2h_server";
 
- deps = [];
+  deps = [];
 }
diff --git a/dist/trycp_server/config.nix b/dist/trycp_server/config.nix
@@ -1,12 +1,12 @@
 {
- name = "trycp_server";
+  name = "trycp_server";
 
- sha256 = {
-  linux = "1qnz2fsdjdj9s7mcl9jwgbjk5qf38zd35l696ckvwv2n9fgmz7mi";
-  darwin = "1v6ph20j200cal14hjd1gv5kfbi59pkqcsipd8lrqhxnbyl70lhx";
- };
+  sha256 = {
+   linux = "0xigbhs3m4lg6nmhwrvvipgdaiync8n5wrcj9d957vp1cg3xi7vk";
+   darwin = "0ghrbqkl46y0fpx4aylxv158vbyiqkmd83ap0z0zvfl932axvbj0";
+  };
 
- binary = "trycp_server";
+  binary = "trycp_server";
 
- deps = [];
+  deps = [];
 }
diff --git a/docker/Dockerfile.debian b/docker/Dockerfile.debian
@@ -32,7 +32,7 @@ WORKDIR /home/docker
 
 # https://nixos.wiki/wiki/Nix_Installation_Guide#Single-user_install
 RUN sudo install -d -m755 -o $(id -u) -g $(id -g) /nix
-RUN curl https://nixos.org/nix/install | sh
+RUN curl -L https://nixos.org/nix/install | sh
 
 # warm nix and avoid warnings about missing channels
 # https://github.com/NixOS/nixpkgs/issues/40165

diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu
@@ -32,7 +32,7 @@ WORKDIR /home/docker
 
 # https://nixos.wiki/wiki/Nix_Installation_Guide#Single-user_install
 RUN sudo install -d -m755 -o $(id -u) -g $(id -g) /nix
-RUN curl https://nixos.org/nix/install | sh
+RUN curl -L https://nixos.org/nix/install | sh
 
 # warm nix and avoid warnings about missing channels
 # https://github.com/NixOS/nixpkgs/issues/40165

diff --git a/docs/content/docs/install/index.md b/docs/content/docs/install/index.md
@@ -34,7 +34,7 @@ apt-get install -y sudo curl
 [Nix installation](https://nixos.org/nix/download.html) is the same on Linux and Mac:
 
 ```bash
-curl https://nixos.org/nix/install | sh
+sh <(curl -L https://nixos.org/nix/install)
 ```
 
 Once installation is finished it will tell you to source the new configuration. Run the command the installer tells you to run.