nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-23 12:34:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7276 from spwhitt/git-imerge

Browse Source 
git-imerge: new package
This commit is contained in:
John Wiegley 2015-04-26 19:51:05 -05:00
commit de808ae79f
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -102,4 +102,6 @@ rec {
git-extras = callPackage ./git-extras { }; git-extras = callPackage ./git-extras { };
git-cola = callPackage ./git-cola { }; git-cola = callPackage ./git-cola { };
git-imerge = callPackage ./git-imerge { };
} }

27
pkgs/applications/version-management/git-and-tools/git-imerge/default.nix Normal file
View File

@ -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 ];
};
}