Merge pull request #24553 from ndowens/git-imerge

git-imerge: 0.7.0 -> 1.0.0

authored by Jörg Thalheim and committed by GitHub 3e7c485e dac0e94e

+9 -11
+9 -11
pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
··· 1 - { stdenv, fetchurl, pythonPackages }: 2 3 stdenv.mkDerivation rec { 4 name = "git-imerge-${version}"; 5 - version = "0.7.0"; 6 7 - src = fetchurl { 8 - url = "https://github.com/mhagger/git-imerge/archive/${version}.tar.gz"; 9 - sha256 = "00nwn3rfhf15wsv01lfji5412d7yz827ric916lnyp662d6gx206"; 10 }; 11 12 buildInputs = [ pythonPackages.python pythonPackages.wrapPython ]; 13 14 - installPhase = '' 15 - mkdir -p $out/bin 16 - make install PREFIX=$out 17 - wrapPythonPrograms 18 - ''; 19 - 20 meta = with stdenv.lib; { 21 homepage = https://github.com/mhagger/git-imerge; 22 description = "Perform a merge between two branches incrementally";
··· 1 + { stdenv, fetchFromGitHub, pythonPackages }: 2 3 stdenv.mkDerivation rec { 4 name = "git-imerge-${version}"; 5 + version = "1.0.0"; 6 7 + src = fetchFromGitHub { 8 + owner = "mhagger"; 9 + repo = "git-imerge"; 10 + rev = "v${version}"; 11 + sha256 = "1ylzxmbjfrzzxmcrbqzy1wv21npqj1r6cgl77a9n2zvsrz8zdb74"; 12 }; 13 14 buildInputs = [ pythonPackages.python pythonPackages.wrapPython ]; 15 16 + makeFlags = "PREFIX= DESTDIR=$(out)" ; 17 + 18 meta = with stdenv.lib; { 19 homepage = https://github.com/mhagger/git-imerge; 20 description = "Perform a merge between two branches incrementally";