Format the entire project.
This commit is contained in:
parent
1dc50ae17d
commit
6f9db5e3a4
115 changed files with 3451 additions and 2901 deletions
|
@ -1,14 +1,15 @@
|
|||
{ config, ... }:
|
||||
|
||||
let
|
||||
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;};
|
||||
{config, ...}: let
|
||||
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 {
|
||||
|
@ -16,24 +17,28 @@ let
|
|||
channel = "nightly";
|
||||
};
|
||||
rustNightly = {
|
||||
rustc = nightly.rust.override {
|
||||
extensions = [
|
||||
"clippy-preview"
|
||||
"rls-preview"
|
||||
"rust-analysis"
|
||||
"rust-src"
|
||||
"rustfmt-preview"
|
||||
]; } // { src = nightly.rust-src; };
|
||||
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 {
|
||||
rustPNightly = stablepkgs.recurseIntoAttrs (stablepkgs.makeRustPlatform {
|
||||
inherit (rustNightly) rustc cargo;
|
||||
});
|
||||
|
||||
in {
|
||||
config.machine.pkgsets.rustpkgs.pkgs = (with stablepkgs; [
|
||||
diesel-cli
|
||||
carnix
|
||||
rustracer
|
||||
]) ++ (with rustNightly; [ rustc cargo]);
|
||||
config.machine.pkgsets.rustpkgs.pkgs =
|
||||
(with stablepkgs; [
|
||||
diesel-cli
|
||||
carnix
|
||||
rustracer
|
||||
])
|
||||
++ (with rustNightly; [rustc cargo]);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue