Merge #131: Update nixpkgs

5575878aad Update nixpkgs (Jonas Nick)
ab35dc29eb Update hwi 1.0.1 -> 1.0.3 Also remove unstable hwi build from travis because hwi requires mnemonic <0.19.0 but nixpkgs unstable has 0.19.0. (Jonas Nick)
44372e764f Update nixpkgs (Jonas Nick)

Pull request description:

  Updates clightning to 0.7.3.

Top commit has no ACKs.

Tree-SHA512: d730cb2e46f282454e483192d0f91c4b8463ca40ae9f4a5a5a5ff01861fad349a03ab780b3151937ec35e9f70a7b2d470495002bcab8d174176b7d49cce62c7d
This commit is contained in:
Jonas Nick 2019-11-23 13:06:39 +00:00
commit 6c69eb8576
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
3 changed files with 8 additions and 9 deletions

View File

@ -20,7 +20,6 @@ env:
matrix:
- PKG=nodeinfo STABLE=1
- PKG=hwi STABLE=1
- PKG=hwi STABLE=0
- PKG=lightning-charge STABLE=1
- PKG=lightning-charge STABLE=0
- PKG=nanopos STABLE=1

View File

@ -1,20 +1,20 @@
{ stdenv, fetchurl, fetchFromGitHub, python35 }:
{ stdenv, fetchurl, fetchFromGitHub, python3 }:
with stdenv.lib;
with python35.pkgs;
with python3.pkgs;
let
buildInputs = [ mnemonic ecdsa typing-extensions hidapi libusb1 pyaes ];
in
buildPythonPackage rec {
pname = "hwi";
version = "1.0.1";
version = "1.0.3";
src = fetchFromGitHub {
owner = "bitcoin-core";
repo = "HWI";
rev = version;
sha256 = "0m3p72r8ghzwwsmc7y0dzxn0wzaplqqq1q0cd327fnnljddp5b10";
sha256 = "1xb8w6w6j6vv2ik2bb25y2w6m0gikmh5446jar0frfp6r6das5nn";
};
# TODO: enable tests

View File

@ -8,11 +8,11 @@ in
{
# To update, run ../helper/fetch-channel REV
nixpkgs = fetch {
rev = "27a5ddcf747fb2bb81ea9c63f63f2eb3eec7a2ec";
sha256 = "1bp11q2marsqj3g2prdrghkhmv483ab5pi078d83xkhkk2jh3h81";
rev = "e6d584f6dd22b587d5cdf5019f5e7dd2be370f61";
sha256 = "0ysb2017n8g0bpkxy3lsnlf6mcya5gqwggmwdjxlfnj1ilj3lnqz";
};
nixpkgs-unstable = fetch {
rev = "4cd2cb43fb3a87f48c1e10bb65aee99d8f24cb9d";
sha256 = "1d6rmq67kdg5gmk94wx2774qw89nvbhy6g1f2lms3c9ph37hways";
rev = "41d921292e922a6cd1aba64259341c244d4c2cc7";
sha256 = "01iq7phnmyz78qddxsjy6lnpgmzcffxk9h7k69sy61dbjsyy9b4q";
};
}