Merge branch 'master' into eftychis-remove-unwraps

dfinity · Nov 8, 2019 · 2e9530d · 2e9530d
2 parents 21401cd + c945dee
commit 2e9530d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/nix/e2e-tests.nix b/nix/e2e-tests.nix
@@ -6,20 +6,15 @@
 ,   runCommandNoCC
 ,   stdenv
 ,   killall
+,   sources
 }:
-let batslib = builtins.fetchGit {
-    url = "https://github.com/ztombol/bats-support";
-    ref = "refs/tags/v0.3.0";
-    rev = "24a72e14349690bcbf7c151b9d2d1cdd32d36eb1";
-}; in
-
 runCommandNoCC "e2e-tests" {
-    buildInputs = [ bats batslib coreutils curl dfinity-sdk.packages.rust-workspace-debug stdenv.cc killall netcat ];
+    buildInputs = [ bats coreutils curl dfinity-sdk.packages.rust-workspace-debug stdenv.cc killall netcat ];
 } ''
     # We want $HOME/.cache to be in a new temporary directory.
     export HOME=$(mktemp -d -t dfx-e2e-home-XXXX)
     # We use BATSLIB in our scripts to find the root of the BATSLIB repo.
-    export BATSLIB="${batslib}"
+    export BATSLIB="${sources.bats-support}"
 
     # Timeout of 10 minutes is enough for now. Reminder; CI might be running with
     # less resources than a dev's computer, so e2e might take longer.

diff --git a/nix/overlays/motoko.nix b/nix/overlays/motoko.nix
@@ -3,7 +3,7 @@ self: super:
 let src = builtins.fetchGit {
   url = "ssh://git@github.com/dfinity-lab/motoko";
   ref = "master";
-  rev = "b5573dfceaf963256d244eb1e9f5468415f1678b";
+  rev = "c1d1a41c52437fe2fce2d4ce8a9ebe19c83a39e5";
 }; in
 
 let motoko = import src { nixpkgs = self; }; in

diff --git a/nix/sources.json b/nix/sources.json
@@ -1,4 +1,16 @@
 {
+    "bats-support": {
+        "branch": "v0.3.0",
+        "description": "Supporting library for Bats test helpers",
+        "homepage": null,
+        "owner": "ztombol",
+        "repo": "bats-support",
+        "rev": "24a72e14349690bcbf7c151b9d2d1cdd32d36eb1",
+        "sha256": "1sm1y752jrz41qm4bxivk1363ac5zpkyshkk156aqf2p5qjxgpp0",
+        "type": "tarball",
+        "url": "https://github.com/ztombol/bats-support/archive/24a72e14349690bcbf7c151b9d2d1cdd32d36eb1.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
     "napalm": {
         "branch": "master",
         "description": "Support for building npm packages in Nix and lightweight npm registry",