diff options
| author | ndowens <ndowens04@gmail.com> | 2017-04-01 21:24:08 -0500 |
|---|---|---|
| committer | ndowens <ndowens04@gmail.com> | 2017-04-01 21:24:08 -0500 |
| commit | 45fa146829167e6b45f46e131f01ae9b25c1ba15 (patch) | |
| tree | 1c77ff4250a252c2a87b77a81e89d385ccaaf795 | |
| parent | affce1e2464f226afb6902c5185fee80d847d857 (diff) | |
| download | nixpkgs-45fa146829167e6b45f46e131f01ae9b25c1ba15.tar nixpkgs-45fa146829167e6b45f46e131f01ae9b25c1ba15.tar.gz nixpkgs-45fa146829167e6b45f46e131f01ae9b25c1ba15.tar.bz2 nixpkgs-45fa146829167e6b45f46e131f01ae9b25c1ba15.tar.lz nixpkgs-45fa146829167e6b45f46e131f01ae9b25c1ba15.tar.xz nixpkgs-45fa146829167e6b45f46e131f01ae9b25c1ba15.tar.zst nixpkgs-45fa146829167e6b45f46e131f01ae9b25c1ba15.zip | |
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"; |