From cdb4c08d98c7f82d26bb83ff1068dc309e7b7a67 Mon Sep 17 00:00:00 2001
From: 1000101 <jan.hrnko@satoshilabs.com>
Date: Wed, 22 Apr 2020 23:09:47 +0200
Subject: blockbook: 0.3.2 -> 0.3.3

---
 pkgs/servers/blockbook/default.nix |  22 ++-
 pkgs/servers/blockbook/deps.nix    | 372 -------------------------------------
 2 files changed, 14 insertions(+), 380 deletions(-)
 delete mode 100644 pkgs/servers/blockbook/deps.nix

diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix
index b6a1887bf807..475e60d28db3 100644
--- a/pkgs/servers/blockbook/default.nix
+++ b/pkgs/servers/blockbook/default.nix
@@ -1,5 +1,5 @@
 { stdenv
-, buildGoPackage
+, buildGoModule
 , lib
 , fetchFromGitHub
 , rocksdb
@@ -12,25 +12,31 @@
 , lz4
 }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "blockbook";
-  version = "0.3.2";
-
-  goPackagePath = "blockbook";
+  version = "0.3.3";
+  commit = "b6961ca";
 
   src = fetchFromGitHub {
     owner = "trezor";
     repo = "blockbook";
     rev = "v${version}";
-    sha256 = "0hcgz4b7k8ia4dnjg6bbii95sqg3clc40ybwwc4qz3jv21ikc54x";
+    sha256 = "01nb4if2dix2h95xvqvafil325jjw2a4v1izb9mad0cjqcf8rk6n";
   };
 
-  goDeps = ./deps.nix;
+  modSha256 = "1zp06mpkxaxykw8pr679fg9dd7039qj13j5lknxp7hr8dga0jvpy";
 
   buildInputs = [ bzip2 zlib snappy zeromq lz4 ];
 
   nativeBuildInputs = [ pkg-config packr ];
 
+  buildFlagsArray = ''
+    -ldflags=
+       -X github.com/trezor/blockbook/common.version=${version}
+       -X github.com/trezor/blockbook/common.gitcommit=${commit}
+       -X github.com/trezor/blockbook/common.buildDate=unknown
+  '';
+
   preBuild = lib.optionalString stdenv.isDarwin ''
     ulimit -n 8192
   '' + ''
@@ -45,7 +51,7 @@ buildGoPackage rec {
     description = "Trezor address/account balance backend";
     homepage = "https://github.com/trezor/blockbook";
     license = licenses.agpl3;
-    maintainers = with maintainers; [ mmahut ];
+    maintainers = with maintainers; [ mmahut maintainers."1000101" ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/servers/blockbook/deps.nix b/pkgs/servers/blockbook/deps.nix
deleted file mode 100644
index 9f9ae0a4704d..000000000000
--- a/pkgs/servers/blockbook/deps.nix
+++ /dev/null
@@ -1,372 +0,0 @@
-# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
-[
-  {
-    goPackagePath  = "github.com/Groestlcoin/go-groestl-hash";
-    fetch = {
-      type = "git";
-      url = "https://github.com/Groestlcoin/go-groestl-hash";
-      rev =  "790653ac190c4029ee200e82a8f21b5d1afaf7d6";
-      sha256 = "02davg672v9sz8l7a8s0b8m87154p42hkm5r6pavf4gqziw8bmr4";
-    };
-  }
-  {
-    goPackagePath  = "github.com/allegro/bigcache";
-    fetch = {
-      type = "git";
-      url = "https://github.com/allegro/bigcache";
-      rev =  "69ea0af04088faa57adb9ac683934277141e92a5";
-      sha256 = "0ac9pgzgi9lhklkqmc5f5x3d0cbyxjfpadc6mdbd7hdr7rfrjmxf";
-    };
-  }
-  {
-    goPackagePath  = "github.com/aristanetworks/goarista";
-    fetch = {
-      type = "git";
-      url = "https://github.com/aristanetworks/goarista";
-      rev =  "8e7d5b18fe7ad671e07097d5445dbc70422663b2";
-      sha256 = "1jbjviz8qi8izhvdvnbc5d9nqyxfww75ffcvxyhw5yxw9r1v0sn2";
-    };
-  }
-  {
-    goPackagePath  = "github.com/agl/ed25519";
-    fetch = {
-      type = "git";
-      url = "https://github.com/agl/ed25519";
-      rev =  "5312a61534124124185d41f09206b9fef1d88403";
-      sha256 = "1v8mhkf1m3ga5262s75vabskxvsw5rpqvi5nwhxwiv7gfk6h823i";
-    };
-  }
-  {
-    goPackagePath  = "github.com/beorn7/perks";
-    fetch = {
-      type = "git";
-      url = "https://github.com/beorn7/perks";
-      rev =  "3a771d992973f24aa725d07868b467d1ddfceafb";
-      sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3";
-    };
-  }
-  {
-    goPackagePath  = "github.com/bsm/go-vlq";
-    fetch = {
-      type = "git";
-      url = "https://github.com/bsm/go-vlq";
-      rev =  "ec6e8d4f5f4ec0f6e808ffc7f4dcc7516d4d7d49";
-      sha256 = "13nhgpigaqdvcksi6jrav0rqr5mzqkx3wrsans9ql89nva51r9sz";
-    };
-  }
-  {
-    goPackagePath  = "github.com/martinboehm/btcd";
-    fetch = {
-      type = "git";
-      url = "https://github.com/martinboehm/btcd";
-      rev =  "8e7c0427fee5d4778c5d4eb987150369e3ca1d0e";
-      sha256 = "10fwzl8hzqpsq1rk5iz3xs8hbn3wqans12hszvlxlmm2xb0f6z9b";
-    };
-  }
-  {
-    goPackagePath  = "github.com/btcsuite/btclog";
-    fetch = {
-      type = "git";
-      url = "https://github.com/btcsuite/btclog";
-      rev =  "84c8d2346e9fc8c7b947e243b9c24e6df9fd206a";
-      sha256 = "02dl46wcnfpg9sqvg0ipipkpnd7lrf4fnvb9zy56jqa7mfcwc7wk";
-    };
-  }
-  {
-    goPackagePath  = "github.com/dchest/blake256";
-    fetch = {
-      type = "git";
-      url = "https://github.com/dchest/blake256";
-      rev =  "dee3fe6eb0e98dc774a94fc231f85baf7c29d360";
-      sha256 = "18hkfm1zlkf6fsjzljiz5cjxxcf3kl5p9617si8xjggb33adzhyg";
-    };
-  }
-  {
-    goPackagePath  = "github.com/deckarep/golang-set";
-    fetch = {
-      type = "git";
-      url = "https://github.com/deckarep/golang-set";
-      rev =  "1d4478f51bed434f1dadf96dcd9b43aabac66795";
-      sha256 = "01kaqrc5ywbwa46b6lz3db7kkg8q6v383h4lnxds4z3kjglkqaff";
-    };
-  }
-  {
-    goPackagePath  = "github.com/decred/base58";
-    fetch = {
-      type = "git";
-      url = "https://github.com/decred/base58";
-      rev =  "dbeddd8aab76c31eb2ea98351a63fa2c6bf46888";
-      sha256 = "0fm0gsz5myin4n15gx3fhi9pk82p6v0sxza945yvny7n13q44ns5";
-    };
-  }
-  {
-    goPackagePath  = "github.com/decred/dcrd";
-    fetch = {
-      type = "git";
-      url = "https://github.com/decred/dcrd";
-      rev =  "e3e8c47c68b010dbddeb783ebad32a3a4993dd71";
-      sha256 = "0zifsxhrjx282kvsqj80qr3v4af8hx4g6dqvrb6xggpkcaski8b4";
-    };
-  }
-  {
-    goPackagePath  = "github.com/decred/slog";
-    fetch = {
-      type = "git";
-      url = "https://github.com/decred/slog";
-      rev =  "fbd821ef791ba2b8ae945f5d44f4e49396d230c5";
-      sha256 = "0n3c7saiv4j22kjc1pf3771n6khx4g99n8vn4qvvv0i5vv04585n";
-    };
-  }
-  {
-    goPackagePath  = "github.com/ethereum/go-ethereum";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ethereum/go-ethereum";
-      rev =  "24d727b6d6e2c0cde222fa12155c4a6db5caaf2e";
-      sha256 = "0vrhwfavx3gciihf406f2qfrhvhnygvlj2icbswq0d01dx3s566m";
-    };
-  }
-  {
-    goPackagePath  = "github.com/go-stack/stack";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-stack/stack";
-      rev =  "259ab82a6cad3992b4e21ff5cac294ccb06474bc";
-      sha256 = "0irkqifyj84cbnq4n66ax2r591id2285diw5hzcz2k3bga8d8lqr";
-    };
-  }
-  {
-    goPackagePath  = "github.com/gobuffalo/packr";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gobuffalo/packr";
-      rev =  "5a2cbb54c4e7d482e3f518c56f1f86f133d5204f";
-      sha256 = "0hs62w1bv96zzfqqmnq18w71v0kmh4qrqpkf2y8qngvwgan761gd";
-    };
-  }
-  {
-    goPackagePath  = "github.com/gogo/protobuf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gogo/protobuf";
-      rev =  "1adfc126b41513cc696b209667c8656ea7aac67c";
-      sha256 = "1j7azzlnihcvnd1apw5zr0bz30h7n0gyimqqkgc76vzb1n5dpi7m";
-    };
-  }
-  {
-    goPackagePath  = "github.com/golang/glog";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/glog";
-      rev =  "23def4e6c14b4da8ac2ed8007337bc5eb5007998";
-      sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
-    };
-  }
-  {
-    goPackagePath  = "github.com/golang/protobuf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/protobuf";
-      rev =  "925541529c1fa6821df4e44ce2723319eb2be768";
-      sha256 = "1d3zjvhl115l23xakj0014qpjchivlg098h10v5nfirkk1i9f9sa";
-    };
-  }
-  {
-    goPackagePath  = "github.com/golang/snappy";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/snappy";
-      rev =  "553a641470496b2327abcac10b36396bd98e45c9";
-      sha256 = "0kssxnih1l722hx9219c7javganjqkqhvl3i0hp0hif6xm6chvqk";
-    };
-  }
-  {
-    goPackagePath  = "github.com/gorilla/websocket";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gorilla/websocket";
-      rev =  "ea4d1f681babbce9545c9c5f3d5194a789c89f5b";
-      sha256 = "1bhgs2542qs49p1dafybqxfs2qc072xv41w5nswyrknwyjxxs2a1";
-    };
-  }
-  {
-    goPackagePath  = "github.com/martinboehm/bchutil";
-    fetch = {
-      type = "git";
-      url = "https://github.com/martinboehm/bchutil";
-      rev =  "6373f11b6efe1ea81e8713b8788a695b2c144d38";
-      sha256 = "1wp7ixa0n0jj7y9phxm6p3fymc2555fb2k71s91jhis14fil2jim";
-    };
-  }
-  {
-    goPackagePath  = "github.com/martinboehm/btcutil";
-    fetch = {
-      type = "git";
-      url = "https://github.com/martinboehm/btcutil";
-      rev =  "a3d2b8457b77d37c3813742d4030e199b6e09111";
-      sha256 = "0152cyabklv9l39dm1g30jb7hzdv9rj45mp3v9x4kvaza58nz0x4";
-    };
-  }
-  {
-    goPackagePath  = "github.com/juju/errors";
-    fetch = {
-      type = "git";
-      url = "https://github.com/juju/errors";
-      rev =  "c7d06af17c68cd34c835053720b21f6549d9b0ee";
-      sha256 = "1dmj8wkpmkw4z4c7wmnscs4ykrcv7p8lgwb75g5akahwqjaf9zcp";
-    };
-  }
-  {
-    goPackagePath  = "github.com/martinboehm/golang-socketio";
-    fetch = {
-      type = "git";
-      url = "https://github.com/martinboehm/golang-socketio";
-      rev =  "f60b0a8befde091474a624a8ffd81ee9912957b3";
-      sha256 = "1zln03qgzzbkr7zwm7ah1iikjdnipacp60bbg9lzkxsdcw2h1vd5";
-    };
-  }
-  {
-    goPackagePath  = "github.com/matttproud/golang_protobuf_extensions";
-    fetch = {
-      type = "git";
-      url = "https://github.com/matttproud/golang_protobuf_extensions";
-      rev =  "3247c84500bff8d9fb6d579d800f20b3e091582c";
-      sha256 = "12hcych25wf725zxdkpnyx4wa0gyxl8v4m8xmhdmmaki9bbmqd0d";
-    };
-  }
-  {
-    goPackagePath  = "github.com/mr-tron/base58";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mr-tron/base58";
-      rev =  "c1bdf7c52f59d6685ca597b9955a443ff95eeee6";
-      sha256 = "1dq6i8619manxdhb0fwhdm9ar23kx88pc2xwl1pjla9djrgql6a8";
-    };
-  }
-  {
-    goPackagePath  = "github.com/pebbe/zmq4";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pebbe/zmq4";
-      rev =  "5b443b6471cea4b4f9f85025530c04c93233f76a";
-      sha256 = "0vnwlabrlrzszqyfbw4vypalhsxi4l4ywcbjhfhwl1fpvcph5dar";
-    };
-  }
-  {
-    goPackagePath  = "github.com/pkg/errors";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pkg/errors";
-      rev =  "645ef00459ed84a119197bfb8d8205042c6df63d";
-      sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
-    };
-  }
-  {
-    goPackagePath  = "github.com/prometheus/client_golang";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/client_golang";
-      rev =  "c5b7fccd204277076155f10851dad72b76a49317";
-      sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd";
-    };
-  }
-  {
-    goPackagePath  = "github.com/prometheus/client_model";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/client_model";
-      rev =  "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c";
-      sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998";
-    };
-  }
-  {
-    goPackagePath  = "github.com/prometheus/common";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/common";
-      rev =  "d0f7cd64bda49e08b22ae8a730aa57aa0db125d6";
-      sha256 = "1d4hfbb66xsf0wq317fwhgrwakqzhvryw4d7ip851lwrpql5fqcx";
-    };
-  }
-  {
-    goPackagePath  = "github.com/prometheus/procfs";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/procfs";
-      rev =  "8b1c2da0d56deffdbb9e48d4414b4e674bd8083e";
-      sha256 = "0x128p15h35mgwqxkigfkk1lfrcz9g697ahl8v6xp9kwvcqvjrrf";
-    };
-  }
-  {
-    goPackagePath  = "github.com/rs/cors";
-    fetch = {
-      type = "git";
-      url = "https://github.com/rs/cors";
-      rev =  "feef513b9575b32f84bafa580aad89b011259019";
-      sha256 = "0wjm0yjsnxhnp6924mq8v04srqa8sxrlnd7rkb19h4j6b9zagsik";
-    };
-  }
-  {
-    goPackagePath  = "github.com/schancel/cashaddr-converter";
-    fetch = {
-      type = "git";
-      url = "https://github.com/schancel/cashaddr-converter";
-      rev =  "0a38f5822f795dc3727b4caacc298e02938d9eb1";
-      sha256 = "0d0dsn029yckgjp26vkmg7r476hb6b9ayf2njcgdi648ln8rrad8";
-    };
-  }
-  {
-    goPackagePath  = "github.com/syndtr/goleveldb";
-    fetch = {
-      type = "git";
-      url = "https://github.com/syndtr/goleveldb";
-      rev =  "714f901b98fdb3aa954b4193d8cbd64a28d80cad";
-      sha256 = "0fn70vzqmww5v2xy0lamc319vrmfpza085d196cffhfw0jzw9i18";
-    };
-  }
-  {
-    goPackagePath  = "github.com/tecbot/gorocksdb";
-    fetch = {
-      type = "git";
-      url = "https://github.com/tecbot/gorocksdb";
-      rev =  "214b6b7bc0f06812ab5602fdc502a3e619916f38";
-      sha256 = "1mqpp14z4igr9jip39flpd7nf4rhr3z85y8mg74jjl1yrnwrwsld";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev =  "a832865fa7ada6126f4c6124ac49f71be71bff2a";
-      sha256 = "0bikp74pdi9fsvfdgy0k0r8ipzz96hy28zm8qpky0vdbwqci0a8p";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/net";
-      rev =  "61147c48b25b599e5b561d2e9c4f3e1ef489ca41";
-      sha256 = "1520pdlw9a9s41ad1cf1z6y2ff4j96zbn82qffrxqk02bqlr9f5w";
-    };
-  }
-  {
-    goPackagePath  = "gopkg.in/karalabe/cookiejar.v2";
-    fetch = {
-      type = "git";
-      url = "https://github.com/karalabe/cookiejar";
-      rev =  "8dcd6a7f4951f6ff3ee9cbb919a06d8925822e57";
-      sha256 = "1dbizcklsfn6b5i182nf9pgkk4ac8jnmq8zix73si7x2n53wyb3b";
-    };
-  }
-  {
-    goPackagePath  = "gopkg.in/natefinch/npipe.v2";
-    fetch = {
-      type = "git";
-      url = "https://github.com/natefinch/npipe";
-      rev =  "c1b8fa8bdccecb0b8db834ee0b92fdbcfa606dd6";
-      sha256 = "1qplrvhks05pay169d9lph3hl7apdam4vj1kx3yzik7cphx6b24f";
-    };
-  }
-]
\ No newline at end of file
-- 
cgit 1.4.1