diff options
author | John Wiegley <johnw@newartisans.com> | 2015-04-26 19:51:05 -0500 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2015-04-26 19:51:05 -0500 |
commit | de808ae79fcdabe461ab220626b3a2dbd2e0b050 (patch) | |
tree | 86fb967e90bee303610b370b33bcf0781319cba6 /pkgs | |
parent | 2a8b3c724bef228a36b9d4738d7c576c5e665c10 (diff) | |
parent | 943fd93c14d4f54fd38ea95c53a5bd2108c57f67 (diff) | |
download | nixlib-de808ae79fcdabe461ab220626b3a2dbd2e0b050.tar nixlib-de808ae79fcdabe461ab220626b3a2dbd2e0b050.tar.gz nixlib-de808ae79fcdabe461ab220626b3a2dbd2e0b050.tar.bz2 nixlib-de808ae79fcdabe461ab220626b3a2dbd2e0b050.tar.lz nixlib-de808ae79fcdabe461ab220626b3a2dbd2e0b050.tar.xz nixlib-de808ae79fcdabe461ab220626b3a2dbd2e0b050.tar.zst nixlib-de808ae79fcdabe461ab220626b3a2dbd2e0b050.zip |
Merge pull request #7276 from spwhitt/git-imerge
git-imerge: new package
Diffstat (limited to 'pkgs')
-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 | 27 |
2 files changed, 29 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 8b3558e0adf0..56a6618e5310 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..91180b33cde9 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pythonPackages }: + +stdenv.mkDerivation rec { + name = "git-imerge-${version}"; + version = "0.7.0"; + + src = fetchurl { + url = "https://github.com/mhagger/git-imerge/archive/${version}.tar.gz"; + sha256 = "00nwn3rfhf15wsv01lfji5412d7yz827ric916lnyp662d6gx206"; + }; + + buildInputs = [ pythonPackages.python pythonPackages.wrapPython ]; + + installPhase = '' + mkdir -p $out/bin + make install PREFIX=$out + wrapPythonPrograms + ''; + + 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 ]; + }; +} |