public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #24553 from ndowens/git-imerge

Browse Source 
git-imerge: 0.7.0 -> 1.0.0
This commit is contained in:
Jörg Thalheim 2017-04-02 23:39:53 +02:00 committed by GitHub
commit 3e7c485e19
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
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";