chore: reformat Nix files with `alejandra`
This commit is contained in:
parent
6f69ded3f5
commit
fcf4785e36
14
default.nix
14
default.nix
|
@ -1,6 +1,8 @@
|
|||
(import (let lock = builtins.fromJSON (builtins.readFile ./flake.lock);
|
||||
in fetchTarball {
|
||||
url =
|
||||
"https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
|
||||
sha256 = lock.nodes.flake-compat.locked.narHash;
|
||||
}) { src = ./.; }).defaultNix
|
||||
(import (let
|
||||
lock = builtins.fromJSON (builtins.readFile ./flake.lock);
|
||||
in
|
||||
fetchTarball {
|
||||
url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
|
||||
sha256 = lock.nodes.flake-compat.locked.narHash;
|
||||
}) {src = ./.;})
|
||||
.defaultNix
|
||||
|
|
101
flake.nix
101
flake.nix
|
@ -32,59 +32,70 @@
|
|||
};
|
||||
};
|
||||
|
||||
outputs =
|
||||
{ self, nixpkgs, crane, flake-utils, advisory-db, rust-overlay, ... }:
|
||||
flake-utils.lib.eachDefaultSystem (system:
|
||||
let
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
overlays = [ (import rust-overlay) ];
|
||||
};
|
||||
outputs = {
|
||||
self,
|
||||
nixpkgs,
|
||||
crane,
|
||||
flake-utils,
|
||||
advisory-db,
|
||||
rust-overlay,
|
||||
...
|
||||
}:
|
||||
flake-utils.lib.eachDefaultSystem (system: let
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
overlays = [(import rust-overlay)];
|
||||
};
|
||||
|
||||
rustStable = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
|
||||
craneLib = (crane.mkLib pkgs).overrideToolchain rustStable;
|
||||
src = craneLib.cleanCargoSource ./.;
|
||||
cargoArtifacts = craneLib.buildDepsOnly { inherit src buildInputs; };
|
||||
buildInputs = [ ];
|
||||
rustStable = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
|
||||
craneLib = (crane.mkLib pkgs).overrideToolchain rustStable;
|
||||
src = craneLib.cleanCargoSource ./.;
|
||||
cargoArtifacts = craneLib.buildDepsOnly {inherit src buildInputs;};
|
||||
buildInputs = [];
|
||||
|
||||
file-collector = craneLib.buildPackage {
|
||||
inherit src;
|
||||
doCheck = false;
|
||||
};
|
||||
file-collector = craneLib.buildPackage {
|
||||
inherit src;
|
||||
doCheck = false;
|
||||
};
|
||||
|
||||
file-collector-clippy = craneLib.cargoClippy {
|
||||
inherit cargoArtifacts src buildInputs;
|
||||
cargoClippyExtraArgs = "--all-targets -- --deny warnings";
|
||||
};
|
||||
file-collector-clippy = craneLib.cargoClippy {
|
||||
inherit cargoArtifacts src buildInputs;
|
||||
cargoClippyExtraArgs = "--all-targets -- --deny warnings";
|
||||
};
|
||||
|
||||
file-collector-fmt = craneLib.cargoFmt { inherit src; };
|
||||
file-collector-fmt = craneLib.cargoFmt {inherit src;};
|
||||
|
||||
file-collector-audit = craneLib.cargoAudit { inherit src advisory-db; };
|
||||
file-collector-audit = craneLib.cargoAudit {inherit src advisory-db;};
|
||||
|
||||
file-collector-nextest = craneLib.cargoNextest {
|
||||
inherit cargoArtifacts src buildInputs;
|
||||
partitions = 1;
|
||||
partitionType = "count";
|
||||
};
|
||||
in {
|
||||
checks = {
|
||||
inherit file-collector file-collector-audit file-collector-clippy
|
||||
file-collector-fmt file-collector-nextest;
|
||||
};
|
||||
file-collector-nextest = craneLib.cargoNextest {
|
||||
inherit cargoArtifacts src buildInputs;
|
||||
partitions = 1;
|
||||
partitionType = "count";
|
||||
};
|
||||
in {
|
||||
checks = {
|
||||
inherit
|
||||
file-collector
|
||||
file-collector-audit
|
||||
file-collector-clippy
|
||||
file-collector-fmt
|
||||
file-collector-nextest
|
||||
;
|
||||
};
|
||||
|
||||
packages.default = file-collector;
|
||||
packages.default = file-collector;
|
||||
|
||||
apps.default = flake-utils.lib.mkApp { drv = file-collector; };
|
||||
apps.default = flake-utils.lib.mkApp {drv = file-collector;};
|
||||
|
||||
devShells.default = pkgs.mkShell {
|
||||
inputsFrom = builtins.attrValues self.checks;
|
||||
devShells.default = pkgs.mkShell {
|
||||
inputsFrom = builtins.attrValues self.checks;
|
||||
|
||||
nativeBuildInputs = with pkgs; [
|
||||
cargo-audit
|
||||
cargo-release
|
||||
rustStable
|
||||
watchman
|
||||
];
|
||||
};
|
||||
});
|
||||
nativeBuildInputs = with pkgs; [
|
||||
cargo-audit
|
||||
cargo-release
|
||||
rustStable
|
||||
watchman
|
||||
];
|
||||
};
|
||||
});
|
||||
}
|
||||
|
|
14
shell.nix
14
shell.nix
|
@ -1,6 +1,8 @@
|
|||
(import (let lock = builtins.fromJSON (builtins.readFile ./flake.lock);
|
||||
in fetchTarball {
|
||||
url =
|
||||
"https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
|
||||
sha256 = lock.nodes.flake-compat.locked.narHash;
|
||||
}) { src = ./.; }).shellNix
|
||||
(import (let
|
||||
lock = builtins.fromJSON (builtins.readFile ./flake.lock);
|
||||
in
|
||||
fetchTarball {
|
||||
url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
|
||||
sha256 = lock.nodes.flake-compat.locked.narHash;
|
||||
}) {src = ./.;})
|
||||
.shellNix
|
||||
|
|
Loading…
Reference in New Issue