diff options
| author | Spencer Whitt <sw@swhitt.me> | 2015-04-07 00:38:20 -0400 |
|---|---|---|
| committer | Spencer Whitt <sw@swhitt.me> | 2015-04-07 00:40:33 -0400 |
| commit | 309d0f0c8b6664241d3bf5692f4463333f2c85e6 (patch) | |
| tree | 26126b3f43f60be22152ad7858fcd7acc9616e8a /pkgs/applications/version-management/git-and-tools | |
| parent | 22bb53dfe2c2eedfc593120f19ce8fa7ba8f11a8 (diff) | |
| download | nixlib-309d0f0c8b6664241d3bf5692f4463333f2c85e6.tar nixlib-309d0f0c8b6664241d3bf5692f4463333f2c85e6.tar.gz nixlib-309d0f0c8b6664241d3bf5692f4463333f2c85e6.tar.bz2 nixlib-309d0f0c8b6664241d3bf5692f4463333f2c85e6.tar.lz nixlib-309d0f0c8b6664241d3bf5692f4463333f2c85e6.tar.xz nixlib-309d0f0c8b6664241d3bf5692f4463333f2c85e6.tar.zst nixlib-309d0f0c8b6664241d3bf5692f4463333f2c85e6.zip | |
git-imerge: new package
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git-imerge/default.nix | 26 |
2 files changed, 28 insertions, 0 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index b206fc671b5a..f492ae61d0ca 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -102,4 +102,6 @@ rec { git-extras = callPackage ./git-extras { }; git-cola = callPackage ./git-cola { }; + + git-imerge = callPackage ./git-imerge { }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix new file mode 100644 index 000000000000..de3041806859 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "git-imerge-${version}"; + version = "0.7.0"; + + src = fetchFromGitHub { + repo = "git-imerge"; + owner = "mhagger"; + rev = version; + sha256 = "09czjxgjbby54jx1v5m825k87v8g9g374hwv0r6ss48kv1ipvakq"; + }; + + installPhase = '' + mkdir -p $out/bin + make install PREFIX=$out + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/mhagger/git-imerge; + description = "Perform a merge between two branches incrementally"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ maintainers.spwhitt ]; + }; +} |