Merge #356: update nixpkgs

7ae0a38701 electrs: replace local version with nixpkgs (Erik Arvstedt)
9588b0af08 update nixpkgs (Jonas Nick)

Pull request description:

ACKs for top commit:
  nixbitcoin:
    ACK 7ae0a38701
  erikarvstedt:
    ACK 7ae0a38701

Tree-SHA512: 2e2c944d70c5cd7f8479fc516c6d6b545dac8f7dc6c39b355e13075a9728083456e4300e9c60a9334dc3dc11b9dd305fd102c7475a414b499e468ad378fe217c
This commit is contained in:
Jonas Nick 2021-05-04 12:14:01 +00:00
commit a5adaad39b
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
6 changed files with 5 additions and 54 deletions

View File

@ -1,7 +1,6 @@
{ pkgs ? import <nixpkgs> {} }: { pkgs ? import <nixpkgs> {} }:
let self = { let self = {
spark-wallet = pkgs.callPackage ./spark-wallet { }; spark-wallet = pkgs.callPackage ./spark-wallet { };
electrs = pkgs.callPackage ./electrs { };
elementsd = pkgs.callPackage ./elementsd { withGui = false; }; elementsd = pkgs.callPackage ./elementsd { withGui = false; };
liquid-swap = pkgs.python3Packages.callPackage ./liquid-swap { }; liquid-swap = pkgs.python3Packages.callPackage ./liquid-swap { };
joinmarket = pkgs.callPackage ./joinmarket { inherit (self) nbPython3Packages; }; joinmarket = pkgs.callPackage ./joinmarket { inherit (self) nbPython3Packages; };

View File

@ -1,24 +0,0 @@
{ lib, rustPlatform, llvmPackages, fetchurl, pkgs }:
rustPlatform.buildRustPackage rec {
pname = "electrs";
version = "0.8.9";
src = fetchurl {
url = "https://github.com/romanz/electrs/archive/v${version}.tar.gz";
# Use ./get-sha256.sh to fetch latest (verified) sha256
sha256 = "e28367127bca9d5444b1061ba7cbf2636788b1db80977da05cd7ba2182dde2ca";
};
# Needed for librocksdb-sys
nativeBuildInputs = [ llvmPackages.clang ];
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
cargoSha256 = "07bh5mdmi70gy8bmwjzw87d4kc12d5aciiq3slgc07fvhc7nrlmx";
meta = with lib; {
description = "An efficient Electrum Server in Rust";
homepage = "https://github.com/romanz/electrs";
license = licenses.mit;
maintainers = with maintainers; [ earvstedt ];
};
}

View File

@ -1,24 +0,0 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p git gnupg
set -euo pipefail
TMPDIR="$(mktemp -d -p /tmp)"
trap "rm -rf $TMPDIR" EXIT
cd $TMPDIR
echo "Fetching latest release"
git clone https://github.com/romanz/electrs 2> /dev/null
cd electrs
latest=$(git describe --tags `git rev-list --tags --max-count=1`)
echo "Latest release is ${latest}"
# GPG verification
export GNUPGHOME=$TMPDIR
echo "Fetching Roman Zeyde's Key"
gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys 15c8c3574ae4f1e25f3f35c587cae5fa46917cbb 2> /dev/null
echo "Verifying latest release"
git verify-tag ${latest}
echo "tag: ${latest}"
# The prefix option is necessary because GitHub prefixes the archive contents in this format
echo "sha256: $(git archive --format tar.gz --prefix=electrs-"${latest//v}"/ ${latest} | sha256sum | cut -d\ -f1)"

View File

@ -8,11 +8,11 @@ in
{ {
# To update, run ../helper/fetch-channel REV # To update, run ../helper/fetch-channel REV
nixpkgs = fetch { nixpkgs = fetch {
rev = "5438e11ea34adf2b8111d80e360442077476ff53"; rev = "dc326c78a93862efb30a76216f527a56496e6284";
sha256 = "14r88yiz69b828hxq1i5xwy63xa4cwzaa88xa4ig05sfsmrf04q1"; sha256 = "094zb1p5i5f2nlxny3dc814jvs90nimdj6wwd80495hgs9z76wgp";
}; };
nixpkgs-unstable = fetch { nixpkgs-unstable = fetch {
rev = "3d1a7716d7f1fccbd7d30ab3b2ed3db831f43bde"; rev = "4518794ee53d109d551c210a6d195b79e9995a90";
sha256 = "14r8qa6lnzp78c3amzi5r8n11l1kcxcx1gjhnc1kmn4indd43649"; sha256 = "1h86bqrkiydn5nwpndg8k5apdjxff5qigbrrwfam3893vgb7hws2";
}; };
} }

View File

@ -14,6 +14,7 @@ in
lndconnect lndconnect
nbxplorer nbxplorer
btcpayserver btcpayserver
electrs
hwi; hwi;
stable = nixBitcoinPkgsStable; stable = nixBitcoinPkgsStable;

View File

@ -3,7 +3,6 @@ let
pkgs = import pinned.nixpkgs-unstable {}; pkgs = import pinned.nixpkgs-unstable {};
nbPkgs = import ../pkgs { inherit pkgs; }; nbPkgs = import ../pkgs { inherit pkgs; };
pkgsUnstable = with nbPkgs; [ pkgsUnstable = with nbPkgs; [
electrs
joinmarket joinmarket
lightning-loop lightning-loop
lightning-pool lightning-pool