diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-04-02 23:39:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-02 23:39:53 +0200 |
| commit | 3e7c485e195adbc383ddb28515b23142dc6cb774 (patch) | |
| tree | c5e56b125e266a7af9be529a9d41d4a2bc3d2e93 | |
| parent | dac0e94e85113f6fb2e7aea94a38c8cc4d70bb3b (diff) | |
| parent | 45fa146829167e6b45f46e131f01ae9b25c1ba15 (diff) | |
| download | nixpkgs-3e7c485e195adbc383ddb28515b23142dc6cb774.tar nixpkgs-3e7c485e195adbc383ddb28515b23142dc6cb774.tar.gz nixpkgs-3e7c485e195adbc383ddb28515b23142dc6cb774.tar.bz2 nixpkgs-3e7c485e195adbc383ddb28515b23142dc6cb774.tar.lz nixpkgs-3e7c485e195adbc383ddb28515b23142dc6cb774.tar.xz nixpkgs-3e7c485e195adbc383ddb28515b23142dc6cb774.tar.zst nixpkgs-3e7c485e195adbc383ddb28515b23142dc6cb774.zip | |
Merge pull request #24553 from ndowens/git-imerge
git-imerge: 0.7.0 -> 1.0.0
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git-imerge/default.nix | 20 |
1 files changed, 9 insertions, 11 deletions
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 91180b33cde..49856552aa3 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,22 +1,20 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchFromGitHub, pythonPackages }: stdenv.mkDerivation rec { name = "git-imerge-${version}"; - version = "0.7.0"; + version = "1.0.0"; - src = fetchurl { - url = "https://github.com/mhagger/git-imerge/archive/${version}.tar.gz"; - sha256 = "00nwn3rfhf15wsv01lfji5412d7yz827ric916lnyp662d6gx206"; + src = fetchFromGitHub { + owner = "mhagger"; + repo = "git-imerge"; + rev = "v${version}"; + sha256 = "1ylzxmbjfrzzxmcrbqzy1wv21npqj1r6cgl77a9n2zvsrz8zdb74"; }; buildInputs = [ pythonPackages.python pythonPackages.wrapPython ]; - installPhase = '' - mkdir -p $out/bin - make install PREFIX=$out - wrapPythonPrograms - ''; - + makeFlags = "PREFIX= DESTDIR=$(out)" ; + meta = with stdenv.lib; { homepage = https://github.com/mhagger/git-imerge; description = "Perform a merge between two branches incrementally"; |