chore(3p/sources): Bump channels & overlays
* //3p/overlays: kill electrum override applied upstream * //corp/tvixbolt, //users/tazjin/predlozhnik: update wasm-bindgen to match nixpkgs and run `cargo update` Change-Id: If4327112832fd0c7938962dd8d3888d4730b7532 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6874 Autosubmit: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
parent
4d19955580
commit
059dea0e32
6 changed files with 80 additions and 95 deletions
15
third_party/overlays/tvl.nix
vendored
15
third_party/overlays/tvl.nix
vendored
|
|
@ -90,19 +90,4 @@ in
|
|||
meta.ci.skip = true;
|
||||
};
|
||||
}));
|
||||
|
||||
|
||||
# Build electrum with protobuf >= 4 by following hypothetical instructions from
|
||||
# upstream commit that pins to < 4
|
||||
# https://github.com/spesmilo/electrum/commit/52b73880f95be5cf51742fec10cde0a2e4b23de4
|
||||
# https://github.com/NixOS/nixpkgs/pull/194112
|
||||
electrum = super.electrum.overrideAttrs (old: {
|
||||
postPatch = ''
|
||||
# make compatible with protobuf4 by easing dependencies ...
|
||||
substituteInPlace ./contrib/requirements/requirements.txt \
|
||||
--replace "protobuf>=3.12,<4" "protobuf>=3.12"
|
||||
# ... and regenerating the paymentrequest_pb2.py file
|
||||
protoc --python_out=. electrum/paymentrequest.proto
|
||||
'' + old.postPatch or "";
|
||||
});
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue