pkgsets/rust: Fix rust overlay.

This commit is contained in:
Kevin Baensch 2020-06-12 08:41:24 +02:00
parent bb84032862
commit f0202c96d9
Signed by: derped
GPG key ID: C0F1D326C7626543

View file

@ -1,13 +1,39 @@
{ config, pkgs, ... }: { config, ... }:
let let
stablepkgs = import <nixos-stable> {}; mozRust = with builtins; (map (p: import ((fetchTarball {
url = "https://github.com/mozilla/nixpkgs-mozilla/archive/e912ed4.tar.gz";
sha256 = "08fvzb8w80bkkabc1iyhzd15f4sm7ra10jn32kfch5klgl0gj3j3";
}) + p))) [
(toPath "/lib-overlay.nix")
(toPath "/rust-overlay.nix")
];
stablepkgs = import <nixos-stable> { overlays = mozRust;};
# https://rust-lang.github.io/rustup-components-history
nightly = stablepkgs.rustChannelOf {
date = "2020-06-10";
channel = "nightly";
};
rustNightly = {
rustc = nightly.rust.override {
extensions = [
"clippy-preview"
"rls-preview"
"rust-analysis"
"rust-src"
"rustfmt-preview"
]; } // { src = nightly.rust-src; };
cargo = nightly.cargo;
};
rustPNightly = stablepkgs.recurseIntoAttrs (stablepkgs.makeRustPlatform {
inherit (rustNightly) rustc cargo;
});
in { in {
config.machine.pkgsets.rustpkgs.pkgs = with stablepkgs; [ config.machine.pkgsets.rustpkgs.pkgs = (with stablepkgs; [
diesel-cli diesel-cli
rustup
rls
carnix carnix
rustracer rustracer
]; ]) ++ (with rustNightly; [ rustc cargo]);
} }