Reformat nix source file using nixfmt
This commit is contained in:
parent
2e4a532958
commit
9201969c1b
GPG key ID:
63E86C3C14A0D721
220 changed files with 3169 additions and 2487 deletions
|
|
@ -24,133 +24,146 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
outputs = {
|
||||
self,
|
||||
flake-utils,
|
||||
nixpkgs,
|
||||
rust-overlay,
|
||||
advisory-db,
|
||||
crane,
|
||||
pre-commit-hooks,
|
||||
...
|
||||
}:
|
||||
flake-utils.lib.eachDefaultSystem (system: let
|
||||
inherit (pkgs) lib;
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
overlays = [
|
||||
(import rust-overlay)
|
||||
(_final: prev: {
|
||||
lib = prev.lib // (import ./nix/lib.nix prev.lib);
|
||||
})
|
||||
];
|
||||
};
|
||||
rustToolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
|
||||
craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain;
|
||||
srcFilters = path: type:
|
||||
builtins.any (lib.flip lib.hasSuffix path) [
|
||||
".sql"
|
||||
".diff"
|
||||
".md"
|
||||
".adoc"
|
||||
".json"
|
||||
]
|
||||
|| (craneLib.filterCargoSources path type);
|
||||
src = lib.cleanSourceWith {
|
||||
src = ./.;
|
||||
filter = srcFilters;
|
||||
};
|
||||
basicArgs = {
|
||||
inherit src;
|
||||
strictDeps = true;
|
||||
};
|
||||
nativeBuildInputs = [];
|
||||
buildInputs = [];
|
||||
genInputs = lib.genInputsWith pkgs;
|
||||
commonArgs =
|
||||
basicArgs
|
||||
// {
|
||||
outputs =
|
||||
{
|
||||
self,
|
||||
flake-utils,
|
||||
nixpkgs,
|
||||
rust-overlay,
|
||||
advisory-db,
|
||||
crane,
|
||||
pre-commit-hooks,
|
||||
...
|
||||
}:
|
||||
flake-utils.lib.eachDefaultSystem (
|
||||
system:
|
||||
let
|
||||
inherit (pkgs) lib;
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
overlays = [
|
||||
(import rust-overlay)
|
||||
(_final: prev: {
|
||||
lib = prev.lib // (import ./nix/lib.nix prev.lib);
|
||||
})
|
||||
];
|
||||
};
|
||||
rustToolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
|
||||
craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain;
|
||||
srcFilters =
|
||||
path: type:
|
||||
builtins.any (lib.flip lib.hasSuffix path) [
|
||||
".sql"
|
||||
".diff"
|
||||
".md"
|
||||
".adoc"
|
||||
".json"
|
||||
]
|
||||
|| (craneLib.filterCargoSources path type);
|
||||
src = lib.cleanSourceWith {
|
||||
src = ./.;
|
||||
filter = srcFilters;
|
||||
};
|
||||
basicArgs = {
|
||||
inherit src;
|
||||
strictDeps = true;
|
||||
};
|
||||
nativeBuildInputs = [ ];
|
||||
buildInputs = [ ];
|
||||
genInputs = lib.genInputsWith pkgs;
|
||||
commonArgs = basicArgs // {
|
||||
cargoArtifacts = self.packages.${system}.cargo-artifacts;
|
||||
buildInputs = genInputs buildInputs;
|
||||
nativeBuildInputs = genInputs nativeBuildInputs;
|
||||
};
|
||||
in {
|
||||
formatter = pkgs.alejandra;
|
||||
checks = {
|
||||
pre-commit-check = pre-commit-hooks.lib.${system}.run {
|
||||
src = ./.;
|
||||
hooks = {
|
||||
alejandra = {
|
||||
enable = true;
|
||||
};
|
||||
rustfmt.enable = true;
|
||||
cargo-check = {
|
||||
enable = true;
|
||||
stages = ["pre-push"];
|
||||
};
|
||||
clippy = {
|
||||
enable = true;
|
||||
stages = ["pre-push"];
|
||||
settings.denyWarnings = true;
|
||||
in
|
||||
{
|
||||
formatter = pkgs.alejandra;
|
||||
checks = {
|
||||
pre-commit-check = pre-commit-hooks.lib.${system}.run {
|
||||
src = ./.;
|
||||
hooks = {
|
||||
alejandra = {
|
||||
enable = true;
|
||||
};
|
||||
rustfmt.enable = true;
|
||||
cargo-check = {
|
||||
enable = true;
|
||||
stages = [ "pre-push" ];
|
||||
};
|
||||
clippy = {
|
||||
enable = true;
|
||||
stages = [ "pre-push" ];
|
||||
settings.denyWarnings = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
package = self.packages.${system}.default.overrideAttrs {
|
||||
doCheck = true;
|
||||
};
|
||||
clippy = craneLib.cargoClippy (
|
||||
commonArgs
|
||||
// {
|
||||
cargoClippyExtraArgs = "--all-targets -- --deny warnings";
|
||||
}
|
||||
);
|
||||
doc = craneLib.cargoDoc commonArgs;
|
||||
deny = craneLib.cargoDeny commonArgs;
|
||||
fmt = craneLib.cargoFmt basicArgs;
|
||||
audit = craneLib.cargoAudit {
|
||||
inherit src advisory-db;
|
||||
};
|
||||
nextest = craneLib.cargoNextest (
|
||||
commonArgs
|
||||
// {
|
||||
partitions = 1;
|
||||
partitionType = "count";
|
||||
cargoNextestExtraArgs = "--no-tests pass";
|
||||
env = {
|
||||
CARGO_PROFILE = "dev";
|
||||
};
|
||||
}
|
||||
);
|
||||
};
|
||||
package = self.packages.${system}.default.overrideAttrs {
|
||||
doCheck = true;
|
||||
};
|
||||
clippy = craneLib.cargoClippy (commonArgs
|
||||
// {
|
||||
cargoClippyExtraArgs = "--all-targets -- --deny warnings";
|
||||
});
|
||||
doc = craneLib.cargoDoc commonArgs;
|
||||
deny = craneLib.cargoDeny commonArgs;
|
||||
fmt = craneLib.cargoFmt basicArgs;
|
||||
audit = craneLib.cargoAudit {
|
||||
inherit src advisory-db;
|
||||
};
|
||||
nextest = craneLib.cargoNextest (commonArgs
|
||||
// {
|
||||
partitions = 1;
|
||||
partitionType = "count";
|
||||
cargoNextestExtraArgs = "--no-tests pass";
|
||||
env = {
|
||||
CARGO_PROFILE = "dev";
|
||||
packages =
|
||||
let
|
||||
callPackage = lib.callPackageWith (pkgs // { inherit craneLib callPackage; });
|
||||
packageArgs = {
|
||||
inherit
|
||||
lib
|
||||
basicArgs
|
||||
buildInputs
|
||||
nativeBuildInputs
|
||||
;
|
||||
};
|
||||
});
|
||||
};
|
||||
packages = let
|
||||
callPackage = lib.callPackageWith (pkgs // {inherit craneLib callPackage;});
|
||||
packageArgs = {
|
||||
inherit lib basicArgs buildInputs nativeBuildInputs;
|
||||
importWithArgs = with lib; flip import packageArgs;
|
||||
in
|
||||
rec {
|
||||
cargo-artifacts = callPackage (importWithArgs ./nix/cargo-artifacts.nix) { };
|
||||
rust-demo = callPackage (importWithArgs ./nix/package.nix) {
|
||||
cargoArtifacts = cargo-artifacts;
|
||||
};
|
||||
default = rust-demo;
|
||||
};
|
||||
apps.default = flake-utils.lib.mkApp {
|
||||
drv = self.packages."${system}".default;
|
||||
};
|
||||
importWithArgs = with lib; flip import packageArgs;
|
||||
in rec {
|
||||
cargo-artifacts = callPackage (importWithArgs ./nix/cargo-artifacts.nix) {};
|
||||
rust-demo = callPackage (importWithArgs ./nix/package.nix) {
|
||||
cargoArtifacts = cargo-artifacts;
|
||||
devShells.default = craneLib.devShell {
|
||||
checks = self.checks.${system};
|
||||
shellHook = '''' + self.checks.${system}.pre-commit-check.shellHook;
|
||||
packages = with pkgs; [
|
||||
rust-analyzer
|
||||
cargo-audit
|
||||
cargo-deny
|
||||
cargo-watch
|
||||
cargo-nextest
|
||||
];
|
||||
env = {
|
||||
RUST_SRC_PATH = "${rustToolchain}/lib/rustlib/src/rust/library";
|
||||
};
|
||||
};
|
||||
default = rust-demo;
|
||||
};
|
||||
apps.default = flake-utils.lib.mkApp {
|
||||
drv = self.packages."${system}".default;
|
||||
};
|
||||
devShells.default = craneLib.devShell {
|
||||
checks = self.checks.${system};
|
||||
shellHook =
|
||||
''''
|
||||
+ self.checks.${system}.pre-commit-check.shellHook;
|
||||
packages = with pkgs; [
|
||||
rust-analyzer
|
||||
cargo-audit
|
||||
cargo-deny
|
||||
cargo-watch
|
||||
cargo-nextest
|
||||
];
|
||||
env = {
|
||||
RUST_SRC_PATH = "${rustToolchain}/lib/rustlib/src/rust/library";
|
||||
};
|
||||
};
|
||||
});
|
||||
}
|
||||
);
|
||||
nixConfig = {
|
||||
keepOutputs = true;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,18 +3,24 @@
|
|||
basicArgs,
|
||||
buildInputs,
|
||||
nativeBuildInputs,
|
||||
}: let
|
||||
f = {
|
||||
craneLib,
|
||||
lib,
|
||||
...
|
||||
} @ args: let
|
||||
genInputs = lib.genInputsWith args;
|
||||
in
|
||||
craneLib.buildDepsOnly (basicArgs
|
||||
}:
|
||||
let
|
||||
f =
|
||||
{
|
||||
craneLib,
|
||||
lib,
|
||||
...
|
||||
}@args:
|
||||
let
|
||||
genInputs = lib.genInputsWith args;
|
||||
in
|
||||
craneLib.buildDepsOnly (
|
||||
basicArgs
|
||||
// {
|
||||
buildInputs = genInputs buildInputs;
|
||||
nativeBuildInputs = genInputs nativeBuildInputs;
|
||||
});
|
||||
}
|
||||
);
|
||||
in
|
||||
with lib; setFunctionArgs f ((functionArgs f) // (genFunctionArgs (buildInputs ++ nativeBuildInputs)))
|
||||
with lib;
|
||||
setFunctionArgs f ((functionArgs f) // (genFunctionArgs (buildInputs ++ nativeBuildInputs)))
|
||||
|
|
|
|||
|
|
@ -7,7 +7,24 @@
|
|||
nameValuePair,
|
||||
getAttrFromPath,
|
||||
...
|
||||
}: {
|
||||
genFunctionArgs = flip pipe [(map (flip pipe [(splitString ".") head (flip nameValuePair false)])) listToAttrs];
|
||||
genInputsWith = pkgs: map (flip pipe [(splitString ".") (flip getAttrFromPath pkgs)]);
|
||||
}:
|
||||
{
|
||||
genFunctionArgs = flip pipe [
|
||||
(map (
|
||||
flip pipe [
|
||||
(splitString ".")
|
||||
head
|
||||
(flip nameValuePair false)
|
||||
]
|
||||
))
|
||||
listToAttrs
|
||||
];
|
||||
genInputsWith =
|
||||
pkgs:
|
||||
map (
|
||||
flip pipe [
|
||||
(splitString ".")
|
||||
(flip getAttrFromPath pkgs)
|
||||
]
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,16 +3,20 @@
|
|||
basicArgs,
|
||||
buildInputs,
|
||||
nativeBuildInputs,
|
||||
}: let
|
||||
f = {
|
||||
craneLib,
|
||||
lib,
|
||||
cargoArtifacts,
|
||||
...
|
||||
} @ args: let
|
||||
genInputs = lib.genInputsWith args;
|
||||
in
|
||||
craneLib.buildPackage (basicArgs
|
||||
}:
|
||||
let
|
||||
f =
|
||||
{
|
||||
craneLib,
|
||||
lib,
|
||||
cargoArtifacts,
|
||||
...
|
||||
}@args:
|
||||
let
|
||||
genInputs = lib.genInputsWith args;
|
||||
in
|
||||
craneLib.buildPackage (
|
||||
basicArgs
|
||||
// {
|
||||
inherit
|
||||
(craneLib.crateNameFromCargoToml {
|
||||
|
|
@ -25,6 +29,8 @@
|
|||
buildInputs = genInputs buildInputs;
|
||||
nativeBuildInputs = genInputs nativeBuildInputs;
|
||||
doCheck = false;
|
||||
});
|
||||
}
|
||||
);
|
||||
in
|
||||
with lib; setFunctionArgs f ((functionArgs f) // (genFunctionArgs (buildInputs ++ nativeBuildInputs)))
|
||||
with lib;
|
||||
setFunctionArgs f ((functionArgs f) // (genFunctionArgs (buildInputs ++ nativeBuildInputs)))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue