Reformat with nixfmt-rfc-style

This commit is contained in:
Carlos de Paula 2025-10-25 09:52:07 -03:00
parent 265129d419
commit 4191de78bd
2 changed files with 48 additions and 18 deletions

View file

@ -8,8 +8,16 @@
};
};
outputs = { self, nixpkgs, rust-overlay, flake-utils, ... }:
flake-utils.lib.eachDefaultSystem (system:
outputs =
{
self,
nixpkgs,
rust-overlay,
flake-utils,
...
}:
flake-utils.lib.eachDefaultSystem (
system:
let
pkgs = import nixpkgs {
inherit system;
@ -23,13 +31,19 @@
rev = self.shortRev or self.dirtyShortRev or "dirty";
date = self.lastModifiedDate or self.lastModified or "19700101";
version = (builtins.fromTOML
(builtins.readFile ./yazi-fm/Cargo.toml)).package.version
version =
(builtins.fromTOML (builtins.readFile ./yazi-fm/Cargo.toml)).package.version
+ "pre${builtins.substring 0 8 date}_${rev}";
in {
in
{
packages = {
yazi-unwrapped = pkgs.callPackage ./nix/yazi-unwrapped.nix {
inherit version rev date rustPlatform;
inherit
version
rev
date
rustPlatform
;
};
yazi = pkgs.callPackage ./nix/yazi.nix {
inherit (self.packages.${system}) yazi-unwrapped;
@ -37,10 +51,14 @@
default = self.packages.${system}.yazi;
};
devShells = { default = pkgs.callPackage ./nix/shell.nix { }; };
devShells = {
default = pkgs.callPackage ./nix/shell.nix { };
};
formatter = pkgs.nixfmt-rfc-style;
}) // {
}
)
// {
overlays = {
default = self.overlays.yazi;
yazi = _: prev: {

View file

@ -1,13 +1,25 @@
{ callPackage, rust-bin, nodePackages, }:
let mainPkg = callPackage ./yazi.nix { };
in mainPkg.overrideAttrs (oa: {
{
callPackage,
rust-bin,
nodePackages,
}:
let
mainPkg = callPackage ./yazi.nix { };
in
mainPkg.overrideAttrs (oa: {
nativeBuildInputs = [
(rust-bin.nightly.latest.default.override {
extensions = [ "rust-src" "rustfmt" "rust-analyzer" "clippy" ];
extensions = [
"rust-src"
"rustfmt"
"rust-analyzer"
"clippy"
];
})
nodePackages.cspell
] ++ (oa.nativeBuildInputs or [ ]);
]
++ (oa.nativeBuildInputs or [ ]);
env.RUST_BACKTRACE = "1";
})