chore: nixfmt *
This commit is contained in:
parent
dc761a5271
commit
d039179898
161 changed files with 2688 additions and 3024 deletions
|
@ -1,10 +1,6 @@
|
|||
{ gitpkgs ? import /home/steveej/src/github/NixOS/nixpkgs {}
|
||||
, pkgs ? gitpkgs
|
||||
, name ? "generic"
|
||||
, version ? "Stable"
|
||||
, extraBuildInputs ? []
|
||||
}:
|
||||
let
|
||||
{ gitpkgs ? import /home/steveej/src/github/NixOS/nixpkgs { }, pkgs ? gitpkgs
|
||||
, name ? "generic", version ? "Stable", extraBuildInputs ? [ ] }:
|
||||
let
|
||||
rustPackages = builtins.getAttr "rust${version}" pkgs;
|
||||
rustc = rustPackages.rustc;
|
||||
rustShellHook = { rustc, name }: ''
|
||||
|
@ -12,20 +8,21 @@ let
|
|||
setPS1 $rustname
|
||||
unset name
|
||||
'';
|
||||
commonVimRC = ''
|
||||
'';
|
||||
commonVimRC = "";
|
||||
in pkgs.stdenv.mkDerivation {
|
||||
inherit name;
|
||||
buildInputs = with rustPackages;[
|
||||
( import ./vim-rust.nix { pkgs=gitpkgs; commonRC=commonVimRC;
|
||||
buildInputs = with rustPackages;
|
||||
[
|
||||
(import ./vim-rust.nix {
|
||||
pkgs = gitpkgs;
|
||||
commonRC = commonVimRC;
|
||||
inherit rustc;
|
||||
racerd=pkgs.rustracerd;
|
||||
})
|
||||
rustc cargo
|
||||
] ++ [
|
||||
pkgs.rustfmt
|
||||
] ++ extraBuildInputs;
|
||||
shellHook = (rustShellHook){
|
||||
racerd = pkgs.rustracerd;
|
||||
})
|
||||
rustc
|
||||
cargo
|
||||
] ++ [ pkgs.rustfmt ] ++ extraBuildInputs;
|
||||
shellHook = (rustShellHook) {
|
||||
inherit name;
|
||||
inherit rustc;
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue