From db63f9358fdcf7faa52f2bcf08b11aa7cb420b78 Mon Sep 17 00:00:00 2001 From: Christina Sørensen Date: Fri, 29 Sep 2023 07:40:14 +0200 Subject: eza: use by-name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christina Sørensen --- pkgs/by-name/ez/eza/package.nix | 70 +++++++++++++++++++++++++++++++++++++++++ pkgs/tools/misc/eza/default.nix | 70 ----------------------------------------- pkgs/top-level/all-packages.nix | 4 --- 3 files changed, 70 insertions(+), 74 deletions(-) create mode 100644 pkgs/by-name/ez/eza/package.nix delete mode 100644 pkgs/tools/misc/eza/default.nix diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix new file mode 100644 index 0000000000000..52d7ad5bc8048 --- /dev/null +++ b/pkgs/by-name/ez/eza/package.nix @@ -0,0 +1,70 @@ +{ lib +, gitSupport ? true +, stdenv +, fetchFromGitHub +, rustPlatform +, cmake +, pandoc +, pkg-config +, zlib +, darwin +, libiconv +, installShellFiles + # once eza upstream gets support for setting up a compatibilty symlink for exa, we should change + # the handling here from postInstall to passing the required argument to the builder. +, exaAlias ? true +}: + +rustPlatform.buildRustPackage rec { + pname = "eza"; + version = "0.13.1"; + + src = fetchFromGitHub { + owner = "eza-community"; + repo = "eza"; + rev = "v${version}"; + hash = "sha256-/Aqt4TjXAJCF6woyJ90lbVt0eN1QuPWk9A8RhggKHJk="; + }; + + cargoHash = "sha256-ofB61CsXH+CxnuWBbwUgUbBiF5bg35swxcFpVOzDN9I="; + + nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; + buildInputs = [ zlib ] + ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; + + buildNoDefaultFeatures = true; + buildFeatures = lib.optional gitSupport "git"; + + outputs = [ "out" "man" ]; + + postInstall = '' + pandoc --standalone -f markdown -t man man/eza.1.md > man/eza.1 + pandoc --standalone -f markdown -t man man/eza_colors.5.md > man/eza_colors.5 + pandoc --standalone -f markdown -t man man/eza_colors-explanation.5.md > man/eza_colors-explanation.5 + installManPage man/eza.1 man/eza_colors.5 man/eza_colors-explanation.5 + installShellCompletion \ + --bash completions/bash/eza \ + --fish completions/fish/eza.fish \ + --zsh completions/zsh/_eza + '' + lib.optionalString exaAlias '' + ln -s eza $out/bin/exa + ''; + + meta = with lib; { + description = "A modern, maintained replacement for ls"; + longDescription = '' + eza is a modern replacement for ls. It uses colours for information by + default, helping you distinguish between many types of files, such as + whether you are the owner, or in the owning group. It also has extra + features not present in the original ls, such as viewing the Git status + for a directory, or recursing into directories with a tree view. eza is + written in Rust, so it’s small, fast, and portable. + ''; + homepage = "https://github.com/eza-community/eza"; + changelog = "https://github.com/eza-community/eza/releases/tag/v${version}"; + license = licenses.mit; + mainProgram = "eza"; + maintainers = with maintainers; [ cafkafk _9glenda ]; + platforms = platforms.unix ++ platforms.windows; + }; +} diff --git a/pkgs/tools/misc/eza/default.nix b/pkgs/tools/misc/eza/default.nix deleted file mode 100644 index e675cd1b76083..0000000000000 --- a/pkgs/tools/misc/eza/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib -, gitSupport ? true -, stdenv -, fetchFromGitHub -, rustPlatform -, cmake -, pandoc -, pkg-config -, zlib -, Security -, libiconv -, installShellFiles - # once eza upstream gets support for setting up a compatibilty symlink for exa, we should change - # the handling here from postInstall to passing the required argument to the builder. -, exaAlias ? true -}: - -rustPlatform.buildRustPackage rec { - pname = "eza"; - version = "0.13.1"; - - src = fetchFromGitHub { - owner = "eza-community"; - repo = "eza"; - rev = "v${version}"; - hash = "sha256-/Aqt4TjXAJCF6woyJ90lbVt0eN1QuPWk9A8RhggKHJk="; - }; - - cargoHash = "sha256-ofB61CsXH+CxnuWBbwUgUbBiF5bg35swxcFpVOzDN9I="; - - nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; - buildInputs = [ zlib ] - ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; - - buildNoDefaultFeatures = true; - buildFeatures = lib.optional gitSupport "git"; - - outputs = [ "out" "man" ]; - - postInstall = '' - pandoc --standalone -f markdown -t man man/eza.1.md > man/eza.1 - pandoc --standalone -f markdown -t man man/eza_colors.5.md > man/eza_colors.5 - pandoc --standalone -f markdown -t man man/eza_colors-explanation.5.md > man/eza_colors-explanation.5 - installManPage man/eza.1 man/eza_colors.5 man/eza_colors-explanation.5 - installShellCompletion \ - --bash completions/bash/eza \ - --fish completions/fish/eza.fish \ - --zsh completions/zsh/_eza - '' + lib.optionalString exaAlias '' - ln -s eza $out/bin/exa - ''; - - meta = with lib; { - description = "A modern, maintained replacement for ls"; - longDescription = '' - eza is a modern replacement for ls. It uses colours for information by - default, helping you distinguish between many types of files, such as - whether you are the owner, or in the owning group. It also has extra - features not present in the original ls, such as viewing the Git status - for a directory, or recursing into directories with a tree view. eza is - written in Rust, so it’s small, fast, and portable. - ''; - homepage = "https://github.com/eza-community/eza"; - changelog = "https://github.com/eza-community/eza/releases/tag/v${version}"; - license = licenses.mit; - mainProgram = "eza"; - maintainers = with maintainers; [ cafkafk _9glenda ]; - platforms = platforms.unix ++ platforms.windows; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 449d836683aec..ef389461c9943 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8037,10 +8037,6 @@ with pkgs; expliot = callPackage ../tools/security/expliot { }; - eza = callPackage ../tools/misc/eza { - inherit (darwin.apple_sdk.frameworks) Security; - }; - f2fs-tools = callPackage ../tools/filesystems/f2fs-tools { }; Fabric = with python3Packages; toPythonApplication fabric; -- cgit 1.4.1