summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2020-04-15 18:12:04 +0200
committerMatthias Beyer <mail@beyermatthias.de>2020-04-17 16:29:51 +0200
commit23b420bea3a0b17d66535389a24531a07faa0fea (patch)
treedc4e599934c096c55d30e30f1d6563fccb0bdd9c
parent1eae5707fef0763e26021cf0eae233117d5e534a (diff)
ci: Use mozilla overlay for nixpkgs with current rust
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
-rw-r--r--ci.nix15
1 files changed, 12 insertions, 3 deletions
diff --git a/ci.nix b/ci.nix
index 3b9e0188..29e0064d 100644
--- a/ci.nix
+++ b/ci.nix
@@ -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