diff options
| author | Matthias Beyer <mail@beyermatthias.de> | 2020-04-18 16:46:12 +0200 |
|---|---|---|
| committer | Matthias Beyer <mail@beyermatthias.de> | 2020-04-18 16:46:12 +0200 |
| commit | c73c2bc0afe00a8aa8f3a1fe72556af55299396a (patch) | |
| tree | 6efc77efce04c5b748f553b3c2c13a1844136e71 | |
| parent | 1eae5707fef0763e26021cf0eae233117d5e534a (diff) | |
| parent | 5ba62728ac45ef3d5f2cf01f6f5141afc5815350 (diff) | |
Merge branch 'fix-nixosbuild-srht' into master
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
| -rw-r--r-- | .builds/nixos.yml | 5 | ||||
| -rw-r--r-- | ci.nix | 15 |
2 files changed, 16 insertions, 4 deletions
diff --git a/.builds/nixos.yml b/.builds/nixos.yml index baef33d6..eef09fab 100644 --- a/.builds/nixos.yml +++ b/.builds/nixos.yml @@ -20,7 +20,10 @@ tasks: ~/.cargo/bin/mdbook build - build: | cd imag - nix-shell ./ci.nix --run "cargo build --all --all-features --tests" + nix-shell ./ci.nix --run "cargo build --all --all-features" + - prepare-test: | + git config --global user.name "Test user" + git config --global user.email "test@user.tld" - test: | cd imag nix-shell ./ci.nix --run "cargo test --all --all-features" @@ -1,9 +1,18 @@ -{ pkgs ? (import <nixpkgs> {}) }: +{ ... }: +let + moz_overlay = import ( + builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz + ); + + pkgs = import <nixpkgs> { overlays = [ moz_overlay ]; }; +in pkgs.mkShell { buildInputs = with pkgs; [ - rustc - cargo + rustChannels.stable.rust-std + rustChannels.stable.rust + rustChannels.stable.rustc + rustChannels.stable.cargo cmake curl |