Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ec181f767edf
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 974855c896be
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 4, 2019

  1. gitAndTools.delta: init at 0.0.12

    @marsam
    marsam committed Oct 4, 2019
    Copy the full SHA
    011c984 View commit details

  2. Merge pull request #70379 from marsam/init-gitAndTools.delta 

    gitAndTools.delta: init at 0.0.12
    @marsam
    marsam authored Oct 4, 2019
    Copy the full SHA
    974855c View commit details
Showing with 24 additions and 0 deletions.
  1. +2 −0 pkgs/applications/version-management/git-and-tools/default.nix
  2. +22 −0 pkgs/applications/version-management/git-and-tools/delta/default.nix
2 changes: 2 additions & 0 deletions pkgs/applications/version-management/git-and-tools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -24,6 +24,8 @@ let

darcsToGit = callPackage ./darcs-to-git { };

delta = callPackage ./delta { };

diff-so-fancy = callPackage ./diff-so-fancy { };

ghq = callPackage ./ghq { };
22 changes: 22 additions & 0 deletions pkgs/applications/version-management/git-and-tools/delta/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{ lib, fetchFromGitHub, rustPlatform }:

rustPlatform.buildRustPackage rec {
pname = "delta";
version = "0.0.12";

src = fetchFromGitHub {
owner = "dandavison";
repo = pname;
rev = version;
sha256 = "10jmawxzqgz7gjg1xdna9q2v6l1qlf83ybbqxcbx6941s15lgs7x";
};

cargoSha256 = "1888bvkpalfcw9bc9zmf9bmil6x35l9ia31x6mx1h2dvrfpw3bb1";

meta = with lib; {
homepage = "https://github.com/dandavison/delta";
description = "A syntax-highlighting pager for git";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
};
}