philipp
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merge pull request #98348 from marsam/update-gitAndTools.git-imerge 

gitAndTools.git-imerge: 1.1.0 -> 1.2.0
gstqt5
Mario Rodas 2020-09-21 07:07:03 -05:00 committed by GitHub
parent ba687bfc01 e5869f999f
commit fefb2ad107
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -112,7 +112,7 @@ let
git-ignore = callPackage ./git-ignore { };
git-imerge = callPackage ./git-imerge { };
git-imerge = python3Packages.callPackage ./git-imerge { };
git-interactive-rebase-tool = callPackage ./git-interactive-rebase-tool {
inherit (darwin.apple_sdk.frameworks) Security;

27
pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
View File

@ -1,25 +1,24 @@
{ stdenv, fetchFromGitHub, pythonPackages }:
{ lib, buildPythonApplication, fetchPypi, installShellFiles }:
stdenv.mkDerivation rec {
buildPythonApplication rec {
pname = "git-imerge";
version = "1.1.0";
version = "1.2.0";
src = fetchFromGitHub {
owner = "mhagger";
repo = "git-imerge";
rev = "v${version}";
sha256 = "0vi1w3f0yk4gqhxj2hzqafqq28rihyhyfnp8x7xzib96j2si14a4";
src = fetchPypi {
inherit pname version;
sha256 = "df5818f40164b916eb089a004a47e5b8febae2b4471a827e3aaa4ebec3831a3f";
};
buildInputs = [ pythonPackages.python pythonPackages.wrapPython ];
nativeBuildInputs = [ installShellFiles ];
makeFlags = [ "PREFIX=" "DESTDIR=$(out)" ] ;
meta = with stdenv.lib; {
postInstall = ''
installShellCompletion --bash completions/git-imerge
'';
meta = with lib; {
homepage = "https://github.com/mhagger/git-imerge";
description = "Perform a merge between two branches incrementally";
license = licenses.gpl2;
platforms = platforms.all;
license = licenses.gpl2Plus;
maintainers = [ maintainers.spwhitt ];
};
}