From 940f476eb154c01020749c1a6875b5bb2380888b Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Tue, 13 Apr 2021 09:06:52 +0800 Subject: [PATCH] exa: 0.10.0 -> 0.10.1 --- pkgs/tools/misc/exa/default.nix | 12 ++++++++---- pkgs/tools/misc/exa/update-cargo-lock.diff | 13 +++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 pkgs/tools/misc/exa/update-cargo-lock.diff diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 51873d479f3..632eb459058 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -4,17 +4,20 @@ rustPlatform.buildRustPackage rec { pname = "exa"; - version = "0.10.0"; - - cargoSha256 = "sha256-hslQZkmZ023gKxBbfgwqazBPUk0qWyy51uRJtr3QvWE="; + version = "0.10.1"; src = fetchFromGitHub { owner = "ogham"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xolanu4zhAwsbSPdGKgY2/uHtP30DSpr/7Vv1z4jEnQ="; + sha256 = "sha256-vChsy/FrJEzTO5O+XFycPMP3jqOeea/hfsC0jJbqUVI="; }; + # Cargo.lock is outdated + cargoPatches = [ ./update-cargo-lock.diff ]; + + cargoSha256 = "sha256-ah8IjShmivS6IWL3ku/4/j+WNr/LdUnh1YJnPdaFdcM="; + nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; @@ -44,6 +47,7 @@ rustPlatform.buildRustPackage rec { for a directory, or recursing into directories with a tree view. exa is written in Rust, so it’s small, fast, and portable. ''; + changelog = "https://github.com/ogham/exa/releases/tag/v${version}"; homepage = "https://the.exa.website"; license = licenses.mit; maintainers = with maintainers; [ ehegnes lilyball globin fortuneteller2k ]; diff --git a/pkgs/tools/misc/exa/update-cargo-lock.diff b/pkgs/tools/misc/exa/update-cargo-lock.diff new file mode 100644 index 00000000000..a4c821e4748 --- /dev/null +++ b/pkgs/tools/misc/exa/update-cargo-lock.diff @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index df94188..ed3a068 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -57,7 +57,7 @@ dependencies = [ + + [[package]] + name = "exa" +-version = "0.11.0-pre" ++version = "0.10.1" + dependencies = [ + "ansi_term", + "datetime",