From ef24c6fc219bf19748205b969e2b3b2c7f5972fb Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 23 Apr 2021 16:47:37 +0200 Subject: [PATCH 1/4] lefthook: 0.7.2 -> 0.7.3 --- .../version-management/git-and-tools/lefthook/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index 18f2e5ad487127..ddc7b9ac76c1bc 100644 --- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lefthook"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { rev = "v${version}"; - owner = "Arkweid"; + owner = "evilmartians"; repo = "lefthook"; - sha256 = "1ciyxjx3r3dcl8xas49kqsjshs1bv4pafmfmhdfyfdvlaj374hgj"; + sha256 = "sha256-VrAkmLRsYNDX5VfAxsvjsOv1bv7Nk53OjdaJm/D2GRk="; }; - vendorSha256 = "1pdrw4vwbj9cka2pjbjvxviigfvnrf8sgws27ixwwiblbkj4isc8"; + vendorSha256 = "sha256-XR7xJZfgt0Hx2DccdNlwEmuduuVU8IBR0pcIUyRhdko="; doCheck = false; From 446442947386af04138ec0a5708f7ab1a66afab7 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Fri, 23 Apr 2021 16:49:10 +0200 Subject: [PATCH 2/4] lefthook: use latest go to build --- .../version-management/git-and-tools/lefthook/default.nix | 6 ------ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index ddc7b9ac76c1bc..520f33905c9140 100644 --- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -1,11 +1,5 @@ { lib, buildGoModule, fetchFromGitHub }: -# Currently `buildGo114Module` is passed as `buildGoModule` from -# `../default.nix`. Please remove the fixed 1.14 once a new release has been -# made and the issue linked below has been closed upstream. - -# https://github.com/Arkweid/lefthook/issues/151 - buildGoModule rec { pname = "lefthook"; version = "0.7.3"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75dc83b725628a..0ed0583f68f435 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5950,9 +5950,7 @@ in lbreakout2 = callPackage ../games/lbreakout2 { }; lefthook = callPackage ../applications/version-management/git-and-tools/lefthook { - # Please use empty attrset once upstream bugs have been fixed - # https://github.com/Arkweid/lefthook/issues/151 - buildGoModule = buildGo114Module; + buildGoModule = buildGoModule; }; lego = callPackage ../tools/admin/lego { }; From bb809db7d2d0474052b5402be592bf6219b21f43 Mon Sep 17 00:00:00 2001 From: Sandro Date: Sat, 24 Apr 2021 03:12:44 +0200 Subject: [PATCH 3/4] Update pkgs/top-level/all-packages.nix Co-authored-by: Louis Bettens --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ed0583f68f435..67aaa7e84dcc14 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5950,7 +5950,6 @@ in lbreakout2 = callPackage ../games/lbreakout2 { }; lefthook = callPackage ../applications/version-management/git-and-tools/lefthook { - buildGoModule = buildGoModule; }; lego = callPackage ../tools/admin/lego { }; From 53796929e3151a3e220e6058b41900c15a161287 Mon Sep 17 00:00:00 2001 From: Sandro Date: Sat, 24 Apr 2021 03:13:21 +0200 Subject: [PATCH 4/4] Apply suggestions from code review --- pkgs/top-level/all-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67aaa7e84dcc14..4aaec694210e0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5949,8 +5949,7 @@ in lbreakout2 = callPackage ../games/lbreakout2 { }; - lefthook = callPackage ../applications/version-management/git-and-tools/lefthook { - }; + lefthook = callPackage ../applications/version-management/git-and-tools/lefthook { }; lego = callPackage ../tools/admin/lego { };