public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2021-05-16 18:32:44 +00:00
committed by GitHub
parent 21541fc97c 8c6d819143
commit 6cdac75d25
77 changed files with 796 additions and 1799 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/version-management/git-and-tools/git-cola/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, python3Packages, gettext, git, qt5 }:
let
inherit (python3Packages) buildPythonApplication pyqt5 sip pyinotify;
inherit (python3Packages) buildPythonApplication pyqt5 sip_4 pyinotify;
in buildPythonApplication rec {
pname = "git-cola";
@@ -15,7 +15,7 @@ in buildPythonApplication rec {
};
buildInputs = [ git gettext ];
propagatedBuildInputs = [ pyqt5 sip pyinotify ];
propagatedBuildInputs = [ pyqt5 sip_4 pyinotify ];
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
doCheck = false;
pkgs/applications/version-management/git-and-tools/lefthook/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "lefthook";
version = "0.7.4";
version = "0.7.5";
src = fetchFromGitHub {
rev = "v${version}";
owner = "evilmartians";
repo = "lefthook";
sha256 = "sha256-wW8Obh0YmAZHKrXLQ8364+TrAmLIYKRir2qXdWLtVkE=";
sha256 = "sha256-IKrutZJhs2iuwhXoV+81rDoaSi/xdYRpIlF1YjGFGY4=";
};
vendorSha256 = "sha256-XR7xJZfgt0Hx2DccdNlwEmuduuVU8IBR0pcIUyRhdko=";
vendorSha256 = "sha256-Rp67FnFU27u85t02MIs7wZQoOa8oGsHVVPQ9OdIyTJg=";
doCheck = false;