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
|
||||
, fetchFromGitHub
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, DiskArbitration
|
||||
, Foundation
|
||||
, libiconv
|
||||
, Security
|
||||
, pkg-config
|
||||
, oniguruma
|
||||
, stdenv
|
||||
, darwin
|
||||
, git
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "delta";
|
||||
version = "0.16.4";
|
||||
version = "0.16.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dandavison";
|
||||
repo = pname;
|
||||
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 ];
|
||||
|
||||
env = {
|
||||
RUSTONIG_SYSTEM_LIBONIG = true;
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --bash --name delta.bash etc/completion/completion.bash
|
||||
installShellCompletion --zsh --name _delta etc/completion/completion.zsh
|
||||
installShellCompletion --fish --name delta.fish etc/completion/completion.fish
|
||||
installShellCompletion --cmd delta \
|
||||
etc/completion/completion.{bash,fish,zsh}
|
||||
'';
|
||||
|
||||
checkFlags = lib.optionals stdenv.isDarwin [
|
||||
|
@ -44,6 +53,6 @@ rustPlatform.buildRustPackage rec {
|
|||
description = "A syntax-highlighting pager for git";
|
||||
changelog = "https://github.com/dandavison/delta/releases/tag/${version}";
|
||||
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 { };
|
||||
|
||||
delta = darwin.apple_sdk_11_0.callPackage ../applications/version-management/delta {
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) DiskArbitration Foundation Security;
|
||||
};
|
||||
delta = darwin.apple_sdk_11_0.callPackage ../applications/version-management/delta { };
|
||||
|
||||
diff-so-fancy = callPackage ../applications/version-management/diff-so-fancy { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue