greg/nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #204: electrs: 0.8.3 -> 0.8.5

Browse Source 
a20807b8a3 travis: fix (nixbitcoin)
e81ccb6596 electrs: 0.8.3 -> 0.8.5 (nixbitcoin)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK a20807b8a3

Tree-SHA512: 0be617a32e7daf28c9cd14e7827f13fff0176edd2dd5da210533b5758610ed66ec58acbfb5f632fb72168cdc02c2cb57565038e643ae4c0169b4752d92520bfa
This commit is contained in:
Jonas Nick 2020-07-08 10:16:51 +00:00
commit c93d326cfc
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@ -2,12 +2,7 @@ dist: bionic # needed for KVM
language: shell language: shell
install: install:
# Retry installing nix due to nondeterministic error - curl -L https://nixos.org/nix/install | sh
# 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)
- . /home/travis/.nix-profile/etc/profile.d/nix.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 == 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 - if [[ $STABLE == 0 ]]; then export NIX_PATH="nixpkgs=$(nix eval --raw -f pkgs/nixpkgs-pinned.nix nixpkgs-unstable)"; fi

8
pkgs/electrs/default.nix
View File

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