Merge branch 'master' into unused5

This commit is contained in:
Jörg Thalheim
2018-07-21 15:41:22 +01:00
committed by GitHub
203 changed files with 1655 additions and 627 deletions
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pythonPackages, gettext, git }:
let
inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify python mock;
inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify;
in buildPythonApplication rec {
name = "git-cola-${version}";
version = "3.1";