Merge #201: Update: nixpkgs and elementsd

ae364a68ad hwi: 1.0.3 -> 1.1.2 (nixbitcoin)
fe6e118bb3 elementsd: 0.18.1.3 -> 0.18.1.8 (nixbitcoin)
5ca58a2a26 nixpkgs: update stable and unstable (nixbitcoin)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK ae364a68ad

Tree-SHA512: b8eb4be1ae6496586acb3d0635d6dea676f029a85f17512dccab280aaf3135fccf0455feaf17517e54af85aa5bf92d13df3194ba8893d7c7631d089b9b208b8d
This commit is contained in:
Jonas Nick 2020-07-19 19:26:59 +00:00
commit 5bb9aa5d6d
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
5 changed files with 69 additions and 9 deletions

View File

@ -5,13 +5,13 @@
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec{ stdenv.mkDerivation rec{
name = "elements" + (toString (optional (!withGui) "d")) + "-" + version; name = "elements" + (toString (optional (!withGui) "d")) + "-" + version;
version = "0.18.1.3"; version = "0.18.1.8";
src = fetchurl { src = fetchurl {
urls = [ urls = [
"https://github.com/ElementsProject/elements/archive/elements-${version}.tar.gz" "https://github.com/ElementsProject/elements/archive/elements-${version}.tar.gz"
]; ];
sha256 = "b51d6ee89cf97ae3b19263dc23c576fd690386b1b2850360d595e24159fc0452"; sha256 = "8e1a69e959617c0d200150dff9b0302b5c295ec96f1c94c39c3e8af4d99295de";
}; };
nativeBuildInputs = nativeBuildInputs =

24
pkgs/elementsd/get-sha256.sh Executable file
View File

@ -0,0 +1,24 @@
#! /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/elementsproject/elements 2> /dev/null
cd elements
latest=$(git describe --tags `git rev-list --tags --max-count=1`)
echo "Latest release is ${latest}"
# GPG verification
export GNUPGHOME=$TMPDIR
echo "Fetching Steven Roose's Key"
gpg --keyserver hkps://hkps.pool.sks-keyservers.net --recv-keys DE10E82629A8CAD55B700B972F2A88D7F8D68E87 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=elements-${latest}/ ${latest} | sha256sum | cut -d\ -f1)"

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchFromGitHub, python3 }: { pkgs, stdenv, fetchurl, fetchFromGitHub, python3 }:
with stdenv.lib; with stdenv.lib;
@ -9,18 +9,22 @@ let
mnemonic = self.callPackage ./mnemonic {}; mnemonic = self.callPackage ./mnemonic {};
# HWI requires ecdsa <0.14 but nixpkgs has a newer version # HWI requires ecdsa <0.14 but nixpkgs has a newer version
ecdsa = self.callPackage ./ecdsa {}; ecdsa = self.callPackage ./ecdsa {};
# HWI requires hidapi 0.7.99 but nixpkgs has a newer version
hidapi = self.callPackage ./hidapi {
inherit (pkgs) udev libusb1;
};
}; };
}; };
in in
python.pkgs.buildPythonPackage rec { python.pkgs.buildPythonPackage rec {
pname = "hwi"; pname = "hwi";
version = "1.0.3"; version = "1.1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bitcoin-core"; owner = "bitcoin-core";
repo = "HWI"; repo = "HWI";
rev = version; rev = version;
sha256 = "1xb8w6w6j6vv2ik2bb25y2w6m0gikmh5446jar0frfp6r6das5nn"; sha256 = "01xjkv74ksj8m0l6frk03wq82ilzp5gkz4rf7lhi1h6qkb9kb1x0";
}; };
# TODO: enable tests # TODO: enable tests

View File

@ -0,0 +1,32 @@
{ stdenv, libusb1, udev, darwin, fetchPypi, buildPythonPackage, cython }:
buildPythonPackage rec {
pname = "hidapi";
version = "0.7.99.post21";
src = fetchPypi {
inherit pname version;
sha256 = "e0be1aa6566979266a8fc845ab0e18613f4918cf2c977fe67050f5dc7e2a9a97";
};
propagatedBuildInputs =
stdenv.lib.optionals stdenv.isLinux [ libusb1 udev ] ++
stdenv.lib.optionals stdenv.isDarwin [ darwin.IOKit darwin.apple_sdk.frameworks.CoreFoundation ] ++
[ cython ];
# Fix the USB backend library lookup
postPatch = stdenv.lib.optionalString stdenv.isLinux ''
libusb=${libusb1.dev}/include/libusb-1.0
test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; }
sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py
'';
meta = with stdenv.lib; {
description = "A Cython interface to the hidapi from https://github.com/signal11/hidapi";
homepage = "https://github.com/trezor/cython-hidapi";
# license can actually be either bsd3 or gpl3
# see https://github.com/trezor/cython-hidapi/blob/master/LICENSE-orig.txt
license = licenses.bsd3;
maintainers = with maintainers; [ np ];
};
}

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 = "7829e5791ba1f6e6dbddbb9b43dda72024dd2bd1"; rev = "b103b4bc62085f475d81e61dca85fe03e7eff935";
sha256 = "0hs9swpz0kibjc8l3nx4m10kig1fcjiyy35qy2zgzm0a33pj114w"; sha256 = "1fjb5c80g1vsz9xvii5l6aiga392pbw6dvjky8wmx8xrc5f5g7ja";
}; };
nixpkgs-unstable = fetch { nixpkgs-unstable = fetch {
rev = "8ba41a1e14961fe43523f29b8b39acb569b70e72"; rev = "a5cc7d3197705f933d88e97c0c61849219ce76c1";
sha256 = "0c2wn7si8vcx0yqwm92dpry8zqjglj9dfrvmww6ha6ihnjl6mfhh"; sha256 = "0b7y2nv5nj776zh9jwir8fq1qrgcqpaap05qxlxp9qfngw12k6ji";
}; };
} }