sxyazi/yazi
1
1
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2024-11-24 01:48:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: change the rust tool chain in shell.nix from stable to nightly (#314)

Browse Source
This commit is contained in:
Sinkerine 2023-10-24 01:16:24 -07:00 committed by GitHub
parent 6a651f4e7f
commit b46e71a6bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
flake.nix
View File

@ -11,7 +11,7 @@
}; };
}; };
outputs = { self, nixpkgs, flake-utils, rust-overlay, ... } @ inputs: outputs = { self, nixpkgs, flake-utils, rust-overlay, ... }@inputs:
let let
# Nixpkgs overlays # Nixpkgs overlays
overlays = [ overlays = [
@ -22,15 +22,18 @@
}; };
}) })
]; ];
in in flake-utils.lib.eachDefaultSystem (system:
flake-utils.lib.eachDefaultSystem (system:
let let
pkgs = import nixpkgs { inherit system overlays; }; pkgs = import nixpkgs { inherit system overlays; };
versionSuffix = "pre${builtins.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}_${self.shortRev or "dirty"}"; versionSuffix = "pre${
version = (builtins.fromTOML (builtins.readFile ./yazi-fm/Cargo.toml)).package.version + versionSuffix; builtins.substring 0 8
(self.lastModifiedDate or self.lastModified or "19700101")
}_${self.shortRev or "dirty"}";
version = (builtins.fromTOML
(builtins.readFile ./yazi-fm/Cargo.toml)).package.version
+ versionSuffix;
yazi = pkgs.callPackage ./nix/yazi.nix { inherit version; }; yazi = pkgs.callPackage ./nix/yazi.nix { inherit version; };
in in {
{
packages.default = yazi; packages.default = yazi;
packages.yazi = yazi; packages.yazi = yazi;

13
nix/shell.nix
View File

@ -2,7 +2,6 @@
pkgs.mkShell { pkgs.mkShell {
packages = with pkgs; [ packages = with pkgs; [
rustToolchain
rust-analyzer rust-analyzer
nodePackages.cspell nodePackages.cspell
@ -16,13 +15,13 @@ pkgs.mkShell {
ripgrep ripgrep
fzf fzf
zoxide zoxide
(rust-bin.nightly.latest.rust.override { extensions = [ "rust-src" ]; })
]; ];
buildInputs = with pkgs; lib.optionals stdenv.isDarwin ( buildInputs = with pkgs;
with darwin.apple_sdk.frameworks; [ Foundation ] lib.optionals stdenv.isDarwin
); (with darwin.apple_sdk.frameworks; [ Foundation ]);
env = { env = { RUST_BACKTRACE = "1"; };
RUST_BACKTRACE = "1";
};
} }