mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Reformat with nixfmt-rfc-style

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

44
flake.nix
View file

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

22
nix/shell.nix
View file

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