git-imerge: 0.7.0 -> 1.0.0

This commit is contained in:
ndowens 2017-04-01 21:24:08 -05:00
parent affce1e246
commit 45fa146829

View File

@ -1,22 +1,20 @@
{ stdenv, fetchurl, pythonPackages }: { stdenv, fetchFromGitHub, pythonPackages }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "git-imerge-${version}"; name = "git-imerge-${version}";
version = "0.7.0"; version = "1.0.0";
src = fetchurl { src = fetchFromGitHub {
url = "https://github.com/mhagger/git-imerge/archive/${version}.tar.gz"; owner = "mhagger";
sha256 = "00nwn3rfhf15wsv01lfji5412d7yz827ric916lnyp662d6gx206"; repo = "git-imerge";
rev = "v${version}";
sha256 = "1ylzxmbjfrzzxmcrbqzy1wv21npqj1r6cgl77a9n2zvsrz8zdb74";
}; };
buildInputs = [ pythonPackages.python pythonPackages.wrapPython ]; buildInputs = [ pythonPackages.python pythonPackages.wrapPython ];
installPhase = '' makeFlags = "PREFIX= DESTDIR=$(out)" ;
mkdir -p $out/bin
make install PREFIX=$out
wrapPythonPrograms
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/mhagger/git-imerge; homepage = https://github.com/mhagger/git-imerge;
description = "Perform a merge between two branches incrementally"; description = "Perform a merge between two branches incrementally";