Merge remote-tracking branch 'upstream-pull/101/head'

This commit is contained in:
Jonas Nick 2019-08-05 07:50:58 +00:00
commit 68d25f0c9f
No known key found for this signature in database
GPG Key ID: 4861DBF262123605

View File

@ -23,7 +23,7 @@ rec {
# Use this attribute to refer to the derivation building your root crate package. # Use this attribute to refer to the derivation building your root crate package.
# You can override the features with rootCrate.build.override { features = [ "default" "feature1" ... ]; }. # You can override the features with rootCrate.build.override { features = [ "default" "feature1" ... ]; }.
build = buildRustCrateWithFeatures { build = buildRustCrateWithFeatures {
packageId = "electrs 0.6.2 (registry+https://github.com/romanz/electrs)"; packageId = "electrs 0.7.1 (registry+https://github.com/romanz/electrs)";
features = rootFeatures; features = rootFeatures;
}; };
}; };
@ -35,7 +35,7 @@ rec {
workspaceMembers = { workspaceMembers = {
"electrs" = { "electrs" = {
build = buildRustCrateWithFeatures { build = buildRustCrateWithFeatures {
packageId = "electrs 0.6.2 (registry+https://github.com/romanz/electrs)"; packageId = "electrs 0.7.1 (registry+https://github.com/romanz/electrs)";
features = rootFeatures; features = rootFeatures;
}; };
}; };
@ -845,13 +845,13 @@ rec {
"default" = [ "use_std" ]; "default" = [ "use_std" ];
}; };
}; };
"electrs 0.6.2 (registry+https://github.com/romanz/electrs)" "electrs 0.7.1 (registry+https://github.com/romanz/electrs)"
= rec { = rec {
name = "electrs-${version}"; name = "electrs-${version}";
crateName = "electrs"; crateName = "electrs";
version = "0.6.2"; version = "0.7.1";
edition = "2018"; edition = "2018";
sha256 = "1jymbyrj79x3cm2c6rq4b35v2060as1qjn9b6rbz87if0b7zp3bg"; sha256 = "0wdl6znxc088ncz0yn8kkvg5pyhlcw6dm6yyxabc5xi99fwqq4fd";
authors = [ authors = [
"Roman Zeyde <me@romanzey.de>" "Roman Zeyde <me@romanzey.de>"
]; ];