Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

quorum: 2.5.0 -> 23.4.0

+29 -23
+17 -23
pkgs/applications/blockchains/quorum/default.nix
··· 1 - { lib, fetchFromGitHub, buildGoPackage, git, which, removeReferencesTo, go }: 1 + { lib, fetchFromGitHub, buildGoModule }: 2 2 3 - buildGoPackage rec { 3 + buildGoModule rec { 4 4 pname = "quorum"; 5 - version = "2.5.0"; 6 - 7 - goPackagePath = "github.com/jpmorganchase/quorum"; 5 + version = "23.4.0"; 8 6 9 7 src = fetchFromGitHub { 10 - owner = "jpmorganchase"; 8 + owner = "Consensys"; 11 9 repo = pname; 12 10 rev = "v${version}"; 13 - sha256 = "0xfdaqp9bj5dkw12gy19lxj73zh7w80j051xclsvnd41sfah86ll"; 11 + hash = "sha256-N8MlDHo6LQ/m9xFUeOCm6bqDtjnCc86i/s4ebFLjUT0="; 14 12 }; 15 13 16 - buildInputs = [ git which ]; 14 + vendorHash = "sha256-dTYKGFqVaAnspvKhfBU10bpSzhtQHGTm6KxnNKUVAIg="; 17 15 18 - buildPhase = '' 19 - cd "go/src/$goPackagePath" 20 - make geth bootnode swarm 21 - ''; 16 + patches = [ 17 + # Add missing requirements 18 + ./go.mod.patch 19 + ]; 22 20 23 - installPhase = '' 24 - mkdir -pv $out/bin 25 - cp -v build/bin/geth build/bin/bootnode build/bin/swarm $out/bin 26 - ''; 21 + subPackages = [ 22 + "cmd/geth" 23 + "cmd/bootnode" 24 + ]; 27 25 28 - # fails with `GOFLAGS=-trimpath` 29 - allowGoReference = true; 30 - preFixup = '' 31 - find $out -type f -exec ${removeReferencesTo}/bin/remove-references-to -t ${go} '{}' + 32 - ''; 26 + ldflags = [ "-s" "-w" ]; 33 27 34 28 meta = with lib; { 35 29 description = "A permissioned implementation of Ethereum supporting data privacy"; 36 - homepage = "https://www.goquorum.com/"; 30 + homepage = "https://consensys.net/quorum/"; 37 31 license = licenses.lgpl3; 38 32 maintainers = with maintainers; [ mmahut ]; 39 - platforms = subtractLists ["aarch64-linux"] platforms.linux; 33 + platforms = [ "x86_64-linux" "x86_64-darwin" ]; 40 34 }; 41 35 }
+12
pkgs/applications/blockchains/quorum/go.mod.patch
··· 1 + diff --git a/go.mod b/go.mod 2 + index ace412f41..3336c1e08 100644 3 + --- a/go.mod 4 + +++ b/go.mod 5 + @@ -89,6 +89,7 @@ require ( 6 + golang.org/x/text v0.3.7 7 + golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 8 + google.golang.org/grpc v1.46.0 9 + + google.golang.org/protobuf v1.28.0 10 + gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c 11 + gopkg.in/karalabe/cookiejar.v2 v2.0.0-20150724131613-8dcd6a7f4951 12 + gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce