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