diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-04-02 23:26:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-02 23:26:29 +0200 |
commit | a18ac4fd3535c9eee6f531ee518d55d647d243a0 (patch) | |
tree | 4f390a0bd98985e70f7ce6dde55cd0dc6c163b5d /pkgs/applications | |
parent | 97d35590c92ed542424dc802d3513d7e46c0af96 (diff) | |
parent | 6ee0d284c13d6675cf26bff3129aa1542275232d (diff) | |
download | nixlib-a18ac4fd3535c9eee6f531ee518d55d647d243a0.tar nixlib-a18ac4fd3535c9eee6f531ee518d55d647d243a0.tar.gz nixlib-a18ac4fd3535c9eee6f531ee518d55d647d243a0.tar.bz2 nixlib-a18ac4fd3535c9eee6f531ee518d55d647d243a0.tar.lz nixlib-a18ac4fd3535c9eee6f531ee518d55d647d243a0.tar.xz nixlib-a18ac4fd3535c9eee6f531ee518d55d647d243a0.tar.zst nixlib-a18ac4fd3535c9eee6f531ee518d55d647d243a0.zip |
Merge pull request #24552 from ndowens/git-cola
git-cola: 2.8 -> 2.10
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/git-cola/default.nix | 28 |
1 files changed, 8 insertions, 20 deletions
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 index cf7f6b82ce2a..2a9ea0715e03 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -1,33 +1,21 @@ -{ stdenv, fetchurl, pythonPackages, makeWrapper, gettext, git }: +{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper, gettext, git }: let inherit (pythonPackages) buildPythonApplication pyqt4 sip pyinotify python mock; in buildPythonApplication rec { name = "git-cola-${version}"; - version = "2.8"; + version = "2.10"; - src = fetchurl { - url = "https://github.com/git-cola/git-cola/archive/v${version}.tar.gz"; - sha256 = "19ff7i0h5fznrkm17lp3xkxwkq27whhiil6y6bm16b1wny5hjqlr"; + src = fetchFromGitHub { + owner = "git-cola"; + repo = "git-cola"; + rev = "v${version}"; + sha256 = "067g0yya6718kxagf5qm59zizp0lizca4m3ih85y732i6rqpgwv8"; }; - buildInputs = [ git makeWrapper gettext ]; + buildInputs = [ git gettext ]; propagatedBuildInputs = [ 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 - }' - ''; - doCheck = false; meta = with stdenv.lib; { |