diff options
| author | lethalman <lucabru@src.gnome.org> | 2015-03-11 15:35:37 +0100 |
|---|---|---|
| committer | lethalman <lucabru@src.gnome.org> | 2015-03-11 15:35:37 +0100 |
| commit | 9b699bc9a98e191827cb00698cd354ab26611bcf (patch) | |
| tree | e8a186b261768ba508c7e1add01b59e95b80fad2 /pkgs | |
| parent | 8a9e4271749f1bb1214c2e035effdff4a712dbd4 (diff) | |
| parent | 08ea20df654de16c7e5cb7e51fe3cfb921da97f6 (diff) | |
| download | nixpkgs-9b699bc9a98e191827cb00698cd354ab26611bcf.tar nixpkgs-9b699bc9a98e191827cb00698cd354ab26611bcf.tar.gz nixpkgs-9b699bc9a98e191827cb00698cd354ab26611bcf.tar.bz2 nixpkgs-9b699bc9a98e191827cb00698cd354ab26611bcf.tar.lz nixpkgs-9b699bc9a98e191827cb00698cd354ab26611bcf.tar.xz nixpkgs-9b699bc9a98e191827cb00698cd354ab26611bcf.tar.zst nixpkgs-9b699bc9a98e191827cb00698cd354ab26611bcf.zip | |
Merge pull request #6705 from bobvanderlinden/gitcola
git-cola: add package
Diffstat (limited to 'pkgs')
3 files changed, 39 insertions, 0 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index a313a566c4e..b206fc671b5 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -100,4 +100,6 @@ rec { gitRemoteGcrypt = callPackage ./git-remote-gcrypt { }; git-extras = callPackage ./git-extras { }; + + git-cola = callPackage ./git-cola { }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix new file mode 100644 index 00000000000..eee17911cea --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, python, pythonPackages, makeWrapper, gettext }: + +pythonPackages.buildPythonPackage rec { + name = "git-cola-${version}"; + version = "2.1.1"; + + src = fetchurl { + url = "https://github.com/git-cola/git-cola/archive/v${version}.tar.gz"; + sha256 = "0fpi5nvhyqkx67ak5pfcpgxbc3m19dqlvdh2c9igv2j0vp5rzkj1"; + }; + + buildInputs = [ makeWrapper gettext ]; + propagatedBuildInputs = with pythonPackages; [ pyqt4 sip pyinotify ]; + + # HACK: wrapPythonPrograms adds 'import sys; sys.argv[0] = "git-cola"', but + # "import __future__" must be placed above that. This removes the argv[0] line. + postFixup = '' + wrapPythonPrograms + + sed -i "$out/bin/.git-dag-wrapped" -e '{ + /import sys; sys.argv/d + }' + + sed -i "$out/bin/.git-cola-wrapped" -e '{ + /import sys; sys.argv/d + }' + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/git-cola/git-cola; + description = "A sleek and powerful Git GUI"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ maintainers.bobvanderlinden ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 96bb846c8d0..f1d88f67d08 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10421,6 +10421,7 @@ let pythonSupport = false; }; gitSVN = gitAndTools.gitSVN; + git-cola = gitAndTools.git-cola; gitRepo = callPackage ../applications/version-management/git-repo { python = python27; |