Merge fort-nix/nix-bitcoin#367: lightning-loop & lightning-pool: replace local versions with nixpkgs

ffbbdab999 lightning-loop & lightning-pool: replace local versions with nixpkgs (nixbitcoin)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK ffbbdab999

Tree-SHA512: 9bb2d3c45c6982e0b4dbf73daac400b98642b6c240508d53876078677ab6e7ce497e67829db035975fcc0243fd2285b4e3324637bf0d4dbf05dedda9f9dfe24e
This commit is contained in:
Jonas Nick 2021-07-12 13:01:23 +00:00
commit 833eb4d132
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
7 changed files with 3 additions and 107 deletions

View File

@ -8,8 +8,6 @@ let self = {
nixops19_09 = pkgs.callPackage ./nixops { };
krops = import ./krops { };
netns-exec = pkgs.callPackage ./netns-exec { };
lightning-loop = pkgs.callPackage ./lightning-loop { };
lightning-pool = pkgs.callPackage ./lightning-pool { };
extra-container = pkgs.callPackage ./extra-container { };
clightning-plugins = import ./clightning-plugins pkgs self.nbPython3Packages;
clboss = pkgs.callPackage ./clboss { };

View File

@ -1,23 +0,0 @@
{ pkgs, buildGoModule, fetchurl, lib }:
buildGoModule rec {
pname = "lightning-loop";
version = "0.12.2-beta";
src = fetchurl {
url = "https://github.com/lightninglabs/loop/archive/v${version}.tar.gz";
# Use ./get-sha256.sh to fetch latest (verified) sha256
sha256 = "b2fbacdd8b2311b2f9873fa479e399ef7a09cc038b5c8449f9183b0038d81cc3";
};
subPackages = [ "cmd/loop" "cmd/loopd" ];
vendorSha256 = "03z0cmn9qgcmqm8llybfn1hz1m9hx3pn18m11s3fwnay8ib00r89";
meta = with lib; {
description = " Lightning Loop: A Non-Custodial Off/On Chain Bridge";
homepage = "https://github.com/lightninglabs/loop";
license = lib.licenses.mit;
maintainers = with maintainers; [ nixbitcoin ];
};
}

View File

@ -1,27 +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/lightninglabs/loop 2> /dev/null
cd loop
latest=$(git describe --tags `git rev-list --tags --max-count=1`)
echo "Latest release is ${latest}"
# GPG verification
export GNUPGHOME=$TMPDIR
echo "Fetching Alex Bosworth's Key"
gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys DE23E73BFA8A0AD5587D2FCDE80D2F3F311FD87E 2> /dev/null
echo "Fetching Oliver Gugger's Key"
gpg --keyserver hkps://keys.openpgp.org --recv-keys F4FC70F07310028424EFC20A8E4256593F177720 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=loop-${latest//v}/ ${latest} | sha256sum | cut -d\ -f1)"

View File

@ -1,25 +0,0 @@
{ pkgs, buildGoModule, fetchurl, lib }:
buildGoModule rec {
pname = "lightning-pool";
version = "0.4.4-alpha";
src = fetchurl {
url = "https://github.com/lightninglabs/pool/archive/v${version}.tar.gz";
# Use ./get-sha256.sh to fetch latest (verified) sha256
sha256 = "c50f3b10a4fa7ce1afd6a00fd6c44474f44c8c773de34261e62ae805540ab140";
};
subPackages = [ "cmd/pool" "cmd/poold" ];
vendorSha256 = "190qy3cz18ipv8ilpqhbaaxfi9j2isxpwhagzzspa3pwcpssrv52";
meta = with lib; {
description = ''
A non-custodial batched uniform clearing-price auction for Lightning Channel Leases (LCL)
'';
homepage = "https://github.com/lightninglabs/pool";
license = lib.licenses.mit;
maintainers = with maintainers; [ sputn1ck ];
};
}

View File

@ -1,27 +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/lightninglabs/pool 2> /dev/null
cd pool
latest=$(git describe --tags `git rev-list --tags --max-count=1`)
echo "Latest release is ${latest}"
# GPG verification
export GNUPGHOME=$TMPDIR
echo "Fetching Olaoluwa Osuntokun's key"
gpg --keyserver hkps://keys.openpgp.org --recv-keys 60A1FA7DA5BFF08BDCBBE7903BBD59E99B280306 2> /dev/null
echo "Fetching Oliver Gugger's key"
gpg --keyserver hkps://keys.openpgp.org --recv-keys F4FC70F07310028424EFC20A8E4256593F177720 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=pool-${latest//v}/ ${latest} | sha256sum | cut -d\ -f1)"

View File

@ -15,7 +15,9 @@ in
nbxplorer
btcpayserver
electrs
hwi;
hwi
lightning-loop
lightning-pool;
stable = nixBitcoinPkgsStable;
unstable = nixBitcoinPkgsUnstable;

View File

@ -4,8 +4,6 @@ let
nbPkgs = import ../pkgs { inherit pkgs; };
pkgsUnstable = with nbPkgs; [
joinmarket
lightning-loop
lightning-pool
## elementsd fails with error
# test/key_properties.cpp:16:10: fatal error: rapidcheck/boost_test.h: No such file or directory