diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2020-09-21 07:07:03 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-21 07:07:03 -0500 |
commit | fefb2ad107f532fd356dcc70ef1d148b6140e43e (patch) | |
tree | 425f96feb14142111757ea6c40fc84dd2ed5c12d /pkgs | |
parent | ba687bfc01b91a7c4e80b34911592f452ccc3976 (diff) | |
parent | e5869f999ffb24780c2e53e3cbec22d4c328cbda (diff) |
Merge pull request #98348 from marsam/update-gitAndTools.git-imerge
gitAndTools.git-imerge: 1.1.0 -> 1.2.0
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/git-imerge/default.nix | 27 |
2 files changed, 14 insertions, 15 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index d068fb7316958..2946f7cd5014c 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -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; diff --git a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix index 721a7784e9ca7..e1caede77d8e1 100644 --- a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix @@ -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 ]; }; } |