diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-11-26 02:35:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-26 02:35:31 +0100 |
commit | 05eb63cfd4d2959fbe193e0684dbfc07ff648f2d (patch) | |
tree | bb19964a30be4bd664de1a403252d3719651e097 | |
parent | 7282988ce9775d6c49928994fcf9a86ba5d08ec4 (diff) | |
parent | 4ea35c4c20eb905b775baae4590b8132ee19f2f2 (diff) |
Merge pull request #147432 from qowoz/delta
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/delta/default.nix | 10 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index 77e0d2068fa7b..ca02b6385844b 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -3,26 +3,28 @@ , fetchFromGitHub , rustPlatform , installShellFiles +, DiskArbitration +, Foundation , libiconv , Security }: rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "sha256-PkVZag/h1KzOWsE6+61HIixs+DldrGk9khlZy7DEbC8="; + sha256 = "sha256-aiWVaqwJGjLyv/ZJU4g1KuBC9zbnBEc/vdNADGPKgxo="; }; - cargoSha256 = "sha256-o1HyPJ81g9fLA7CKQNKg1EctoIh3W0uGzKF2YNE+Ado="; + cargoSha256 = "sha256-lp9XzZQZJpjhsanZMky3RwkjM7ICq7dSb4PHdstwMxQ="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation libiconv Security ]; postInstall = '' installShellCompletion --bash --name delta.bash etc/completion/completion.bash diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2664d88acbfc3..0c186c5af42b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4457,7 +4457,7 @@ with pkgs; deer = callPackage ../shells/zsh/zsh-deer { }; delta = callPackage ../applications/version-management/git-and-tools/delta { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation Security; }; deno = callPackage ../development/web/deno { |