mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
delta: 0.16.4 -> 0.16.5, add figsoda as a maintainer
Diff: https://github.com/dandavison/delta/compare/0.16.4...0.16.5 Changelog: https://github.com/dandavison/delta/releases/tag/0.16.5
This commit is contained in:
parent
743be076c0
commit
604210ed34
2 changed files with 26 additions and 19 deletions
|
@ -1,38 +1,47 @@
|
||||||
{ stdenv
|
{ lib
|
||||||
, lib
|
|
||||||
, fetchFromGitHub
|
|
||||||
, rustPlatform
|
, rustPlatform
|
||||||
|
, fetchFromGitHub
|
||||||
, installShellFiles
|
, installShellFiles
|
||||||
, DiskArbitration
|
, pkg-config
|
||||||
, Foundation
|
, oniguruma
|
||||||
, libiconv
|
, stdenv
|
||||||
, Security
|
, darwin
|
||||||
, git
|
, git
|
||||||
}:
|
}:
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "delta";
|
pname = "delta";
|
||||||
version = "0.16.4";
|
version = "0.16.5";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "dandavison";
|
owner = "dandavison";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-lIOJPDnSwyPVhmBUPCiWtpNNxXGRKVruidBKIF9tFvo=";
|
hash = "sha256-W6XtfXfOP8QfQ0t5hquFdYvCO9muE50N1fQsNtnOzfM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-7+SwJ64PJvBi0YOeYcfqsN2f5ehj/t7XhniWd4jWJnM=";
|
cargoHash = "sha256-SNKbgEyelJCHKCaBRfCGc3RECGABtZzMC2rCbhzqZtU=";
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [
|
||||||
|
installShellFiles
|
||||||
|
pkg-config
|
||||||
|
];
|
||||||
|
|
||||||
buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation libiconv Security ];
|
buildInputs = [
|
||||||
|
oniguruma
|
||||||
|
] ++ lib.optionals stdenv.isDarwin [
|
||||||
|
darwin.apple_sdk_11_0.frameworks.Foundation
|
||||||
|
];
|
||||||
|
|
||||||
nativeCheckInputs = [ git ];
|
nativeCheckInputs = [ git ];
|
||||||
|
|
||||||
|
env = {
|
||||||
|
RUSTONIG_SYSTEM_LIBONIG = true;
|
||||||
|
};
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
installShellCompletion --bash --name delta.bash etc/completion/completion.bash
|
installShellCompletion --cmd delta \
|
||||||
installShellCompletion --zsh --name _delta etc/completion/completion.zsh
|
etc/completion/completion.{bash,fish,zsh}
|
||||||
installShellCompletion --fish --name delta.fish etc/completion/completion.fish
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
checkFlags = lib.optionals stdenv.isDarwin [
|
checkFlags = lib.optionals stdenv.isDarwin [
|
||||||
|
@ -44,6 +53,6 @@ rustPlatform.buildRustPackage rec {
|
||||||
description = "A syntax-highlighting pager for git";
|
description = "A syntax-highlighting pager for git";
|
||||||
changelog = "https://github.com/dandavison/delta/releases/tag/${version}";
|
changelog = "https://github.com/dandavison/delta/releases/tag/${version}";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ marsam zowoq SuperSandro2000 ];
|
maintainers = with maintainers; [ marsam zowoq SuperSandro2000 figsoda ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1881,9 +1881,7 @@ with pkgs;
|
||||||
|
|
||||||
darcs-to-git = callPackage ../applications/version-management/darcs-to-git { };
|
darcs-to-git = callPackage ../applications/version-management/darcs-to-git { };
|
||||||
|
|
||||||
delta = darwin.apple_sdk_11_0.callPackage ../applications/version-management/delta {
|
delta = darwin.apple_sdk_11_0.callPackage ../applications/version-management/delta { };
|
||||||
inherit (darwin.apple_sdk_11_0.frameworks) DiskArbitration Foundation Security;
|
|
||||||
};
|
|
||||||
|
|
||||||
diff-so-fancy = callPackage ../applications/version-management/diff-so-fancy { };
|
diff-so-fancy = callPackage ../applications/version-management/diff-so-fancy { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue