From 44372e764fb6c88477b51a9a74351f1d47b789a3 Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Sat, 16 Nov 2019 21:47:06 +0000 Subject: [PATCH 1/3] Update nixpkgs --- pkgs/nixpkgs-pinned.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/nixpkgs-pinned.nix b/pkgs/nixpkgs-pinned.nix index 2b7a2c8..aa1c5b7 100644 --- a/pkgs/nixpkgs-pinned.nix +++ b/pkgs/nixpkgs-pinned.nix @@ -8,11 +8,11 @@ in { # To update, run ../helper/fetch-channel REV nixpkgs = fetch { - rev = "27a5ddcf747fb2bb81ea9c63f63f2eb3eec7a2ec"; - sha256 = "1bp11q2marsqj3g2prdrghkhmv483ab5pi078d83xkhkk2jh3h81"; + rev = "07e66484e679d0e28533543f762be20d6d425b66"; + sha256 = "1d3n1yfp9xhl7nh377sp2wwnh0gscislg6gzj8sgdq169d18lgsg"; }; nixpkgs-unstable = fetch { - rev = "4cd2cb43fb3a87f48c1e10bb65aee99d8f24cb9d"; - sha256 = "1d6rmq67kdg5gmk94wx2774qw89nvbhy6g1f2lms3c9ph37hways"; + rev = "c1966522d7d5fa54db068140d212cba18731dd98"; + sha256 = "104481nxv0hi1rk3g0fjzyki1668p4b46bz0j3lsqv5gv1nm43vm"; }; } From ab35dc29eb9fad08bb2aba4750603807e9f5c78c Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Sun, 17 Nov 2019 14:20:35 +0000 Subject: [PATCH 2/3] 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. --- .travis.yml | 1 - pkgs/hwi/default.nix | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5121480..2846259 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/pkgs/hwi/default.nix b/pkgs/hwi/default.nix index 084de56..9377158 100644 --- a/pkgs/hwi/default.nix +++ b/pkgs/hwi/default.nix @@ -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 From 5575878aad59f90362fe3d897d78c92f1d4a3b27 Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Mon, 18 Nov 2019 23:25:32 +0000 Subject: [PATCH 3/3] Update nixpkgs --- pkgs/nixpkgs-pinned.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/nixpkgs-pinned.nix b/pkgs/nixpkgs-pinned.nix index aa1c5b7..6bf9096 100644 --- a/pkgs/nixpkgs-pinned.nix +++ b/pkgs/nixpkgs-pinned.nix @@ -8,11 +8,11 @@ in { # To update, run ../helper/fetch-channel REV nixpkgs = fetch { - rev = "07e66484e679d0e28533543f762be20d6d425b66"; - sha256 = "1d3n1yfp9xhl7nh377sp2wwnh0gscislg6gzj8sgdq169d18lgsg"; + rev = "e6d584f6dd22b587d5cdf5019f5e7dd2be370f61"; + sha256 = "0ysb2017n8g0bpkxy3lsnlf6mcya5gqwggmwdjxlfnj1ilj3lnqz"; }; nixpkgs-unstable = fetch { - rev = "c1966522d7d5fa54db068140d212cba18731dd98"; - sha256 = "104481nxv0hi1rk3g0fjzyki1668p4b46bz0j3lsqv5gv1nm43vm"; + rev = "41d921292e922a6cd1aba64259341c244d4c2cc7"; + sha256 = "01iq7phnmyz78qddxsjy6lnpgmzcffxk9h7k69sy61dbjsyy9b4q"; }; }