diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-11 14:33:12 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-11 14:36:08 -0400 |
| commit | ee4b56edd364922c6a20a8d7b21a5a72497b4bc2 (patch) | |
| tree | 42bd2a09efe21aa446e411201d4974d39f8a8a4f /pkgs/applications/version-management | |
| parent | 73833ee4465369c9eead8e00ce699053e010de2f (diff) | |
| parent | 62ee7b7b4713c90048ec7063ca4f4cd7677eeb53 (diff) | |
| download | nixpkgs-ee4b56edd364922c6a20a8d7b21a5a72497b4bc2.tar nixpkgs-ee4b56edd364922c6a20a8d7b21a5a72497b4bc2.tar.gz nixpkgs-ee4b56edd364922c6a20a8d7b21a5a72497b4bc2.tar.bz2 nixpkgs-ee4b56edd364922c6a20a8d7b21a5a72497b4bc2.tar.lz nixpkgs-ee4b56edd364922c6a20a8d7b21a5a72497b4bc2.tar.xz nixpkgs-ee4b56edd364922c6a20a8d7b21a5a72497b4bc2.tar.zst nixpkgs-ee4b56edd364922c6a20a8d7b21a5a72497b4bc2.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git-cola/default.nix | 4 |
1 files changed, 2 insertions, 2 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 73f9921d486..391ca26de25 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,7 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, makeWrapper, gettext, git }: let - inherit (pythonPackages) buildPythonApplication pyqt4 sip pyinotify python mock; + inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify python mock; in buildPythonApplication rec { name = "git-cola-${version}"; version = "3.1"; @@ -14,7 +14,7 @@ in buildPythonApplication rec { }; buildInputs = [ git gettext ]; - propagatedBuildInputs = [ pyqt4 sip pyinotify ]; + propagatedBuildInputs = [ pyqt5 sip pyinotify ]; doCheck = false; |