From e81ccb659659bed87d0b76cbe0086ea77fad9e38 Mon Sep 17 00:00:00 2001
From: nixbitcoin <nixbitcoin@i2pmail.org>
Date: Tue, 7 Jul 2020 10:35:57 +0000
Subject: [PATCH 1/2] electrs: 0.8.3 -> 0.8.5

---
 pkgs/electrs/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/electrs/default.nix b/pkgs/electrs/default.nix
index e29efd6..b23af80 100644
--- a/pkgs/electrs/default.nix
+++ b/pkgs/electrs/default.nix
@@ -1,12 +1,12 @@
 { lib, rustPlatform, llvmPackages, fetchurl, pkgs }:
 rustPlatform.buildRustPackage rec {
   pname = "electrs";
-  version = "0.8.3";
+  version = "0.8.5";
 
   src = fetchurl {
     url = "https://github.com/romanz/electrs/archive/v${version}.tar.gz";
     # Use ./get-sha256.sh to fetch latest (verified) sha256
-    sha256 = "6a00226907a0c36b10884e7dd9f87eb58123f089977a752b917d166af072ea3d";
+    sha256 = "651663f68ead632d806980c1915e4b963dcccfbb674c794a7c5d9b7cc4dfecbf";
   };
 
   # Needed for librocksdb-sys
@@ -15,10 +15,10 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = if builtins.pathExists "${pkgs.path}/pkgs/build-support/rust/fetchcargo.nix" then
     # nixpkgs ≤ 20.03
-    "19qs8if8fmygv6j74s6iwzm534fybwasjvmzdqcl996xhg75w6gi"
+    "0clxam7i5yxiqsqxwzdq6z7j7c82rj5zyk186vhvzwh6hzfrv7zm"
   else
     # for recent nixpkgs with cargo-native vendoring (introduced in nixpkgs PR #69274)
-    "1x88zj7p4i7pfb25ch1a54sawgimq16bfcsz1nmzycc8nbwbf493";
+    "0kpv2y22wi42ymcwbqr1cw6npb0ca11hi3dhhhdj1al8kzdgi70w";
 
   meta = with lib; {
     description = "An efficient Electrum Server in Rust";

From a20807b8a3573c4c93ae90a0a2ccf083aad05f8c Mon Sep 17 00:00:00 2001
From: nixbitcoin <nixbitcoin@i2pmail.org>
Date: Tue, 23 Jun 2020 09:22:39 +0000
Subject: [PATCH 2/2] travis: fix

Simplify installing nix package manager. Issue 2733 is fixed in nix
2.3.3 and travis installs 2.3.6.
---
 .travis.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2006734..2514c0a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,12 +2,7 @@ dist: bionic # needed for KVM
 language: shell
 
 install:
-    # Retry installing nix due to nondeterministic error
-    #   Fatal error: glibc detected an invalid stdio handle
-    # see:
-    #   https://github.com/nh2/static-haskell-nix/pull/27#issuecomment-502652181
-    #   https://github.com/nixos/nix/issues/2733
-  - (for i in {1..5}; do bash <(curl https://nixos.org/nix/install) && exit 0; done; exit 1)
+  - curl -L https://nixos.org/nix/install | sh
   - . /home/travis/.nix-profile/etc/profile.d/nix.sh
   - if [[ $STABLE == 1 ]]; then export NIX_PATH="nixpkgs=$(nix eval --raw -f pkgs/nixpkgs-pinned.nix nixpkgs)"; fi
   - if [[ $STABLE == 0 ]]; then export NIX_PATH="nixpkgs=$(nix eval --raw -f pkgs/nixpkgs-pinned.nix nixpkgs-unstable)"; fi