mirror of
https://github.com/sxyazi/yazi.git
synced 2026-07-25 08:41:05 +00:00
Reformat with nixfmt-rfc-style
This commit is contained in:
parent
265129d419
commit
4191de78bd
2 changed files with 48 additions and 18 deletions
44
flake.nix
44
flake.nix
|
|
@ -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,15 +51,19 @@
|
|||
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: {
|
||||
inherit (self.packages.${prev.stdenv.system}) yazi yazi-unwrapped;
|
||||
};
|
||||
}
|
||||
)
|
||||
// {
|
||||
overlays = {
|
||||
default = self.overlays.yazi;
|
||||
yazi = _: prev: {
|
||||
inherit (self.packages.${prev.stdenv.system}) yazi yazi-unwrapped;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
})
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue