From 76827e5ec81c1ba78acc8c2d45a40528c248ff90 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 17 Mar 2023 04:20:00 +0000 Subject: [PATCH] hyperledger-fabric: 2.4.6 -> 2.4.9 https://github.com/hyperledger/fabric/releases/tag/v2.4.9 --- pkgs/tools/misc/hyperledger-fabric/default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/hyperledger-fabric/default.nix b/pkgs/tools/misc/hyperledger-fabric/default.nix index 15bb67d6284..9d13e3f1c39 100644 --- a/pkgs/tools/misc/hyperledger-fabric/default.nix +++ b/pkgs/tools/misc/hyperledger-fabric/default.nix @@ -5,20 +5,22 @@ buildGoModule rec { pname = "hyperledger-fabric"; - version = "2.4.6"; + version = "2.4.9"; src = fetchFromGitHub { owner = "hyperledger"; repo = "fabric"; rev = "v${version}"; - sha256 = "sha256-Q0qrDPih3M4YCzjhLFBy51qVvoICwwn1LJf63rYiUUg="; + hash = "sha256-tHchOki5xlu87onUCqdK/OQxJ6lcvhlUlLcQM6Fap+A="; }; - vendorSha256 = null; + vendorHash = null; postPatch = '' # Broken rm cmd/peer/main_test.go + # Requires network + rm cmd/osnadmin/main_test.go ''; subPackages = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c73b3258e3..510341ddab9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30573,9 +30573,7 @@ with pkgs; hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { }; - hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { - buildGoModule = buildGo119Module; # go 1.20 build failure - }; + hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { }; hypnotix = callPackage ../applications/video/hypnotix { };