gitAndTools.git-imerge: 1.1.0 -> 1.2.0

https://github.com/mhagger/git-imerge/releases/tag/v1.2.0

+14 -15
+1 -1
pkgs/applications/version-management/git-and-tools/default.nix
··· 112 113 git-ignore = callPackage ./git-ignore { }; 114 115 - git-imerge = callPackage ./git-imerge { }; 116 117 git-interactive-rebase-tool = callPackage ./git-interactive-rebase-tool { 118 inherit (darwin.apple_sdk.frameworks) Security;
··· 112 113 git-ignore = callPackage ./git-ignore { }; 114 115 + git-imerge = python3Packages.callPackage ./git-imerge { }; 116 117 git-interactive-rebase-tool = callPackage ./git-interactive-rebase-tool { 118 inherit (darwin.apple_sdk.frameworks) Security;
+13 -14
pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
··· 1 - { stdenv, fetchFromGitHub, pythonPackages }: 2 3 - stdenv.mkDerivation rec { 4 pname = "git-imerge"; 5 - version = "1.1.0"; 6 7 - src = fetchFromGitHub { 8 - owner = "mhagger"; 9 - repo = "git-imerge"; 10 - rev = "v${version}"; 11 - sha256 = "0vi1w3f0yk4gqhxj2hzqafqq28rihyhyfnp8x7xzib96j2si14a4"; 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"; 21 - license = licenses.gpl2; 22 - platforms = platforms.all; 23 maintainers = [ maintainers.spwhitt ]; 24 }; 25 }
··· 1 + { lib, buildPythonApplication, fetchPypi, installShellFiles }: 2 3 + buildPythonApplication rec { 4 pname = "git-imerge"; 5 + version = "1.2.0"; 6 7 + src = fetchPypi { 8 + inherit pname version; 9 + sha256 = "df5818f40164b916eb089a004a47e5b8febae2b4471a827e3aaa4ebec3831a3f"; 10 }; 11 12 + nativeBuildInputs = [ installShellFiles ]; 13 + 14 + postInstall = '' 15 + installShellCompletion --bash completions/git-imerge 16 + ''; 17 18 + meta = with lib; { 19 homepage = "https://github.com/mhagger/git-imerge"; 20 description = "Perform a merge between two branches incrementally"; 21 + license = licenses.gpl2Plus; 22 maintainers = [ maintainers.spwhitt ]; 23 }; 24 }