Unverified Commit dde8c4b5 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #239025 from Groestlcoin/4.4.4

electrum-grs 4.3.1 -> 4.4.4
parents 897d6133 c0ce5cfa
Loading
Loading
Loading
Loading
+6 −5
Original line number Diff line number Diff line
@@ -9,11 +9,11 @@
}:

let
  version = "4.3.1";
  version = "4.4.4";

  libsecp256k1_name =
    if stdenv.isLinux then "libsecp256k1.so.0"
    else if stdenv.isDarwin then "libsecp256k1.0.dylib"
    if stdenv.isLinux then "libsecp256k1.so.{v}"
    else if stdenv.isDarwin then "libsecp256k1.{v}.dylib"
    else "libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}";

  libzbar_name =
@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication {
    owner = "Groestlcoin";
    repo = "electrum-grs";
    rev = "refs/tags/v${version}";
    sha256 = "1h9r32wdn0p7br36r719x96c8gay83dijw80y2ks951mam16mkkb";
    sha256 = "0fl01qdvb1z6l6kwipj1lj0qmjk3mzw25wv7yh5j1hh1f5lng0s8";
  };

  nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ];
@@ -55,6 +55,7 @@ python3.pkgs.buildPythonApplication {
    tlslite-ng
    # plugins
    btchip-python
    ledger-bitcoin
    ckcc-protocol
    keepkey
    trezor
@@ -66,7 +67,7 @@ python3.pkgs.buildPythonApplication {
  postPatch = ''
    # make compatible with protobuf4 by easing dependencies ...
    substituteInPlace ./contrib/requirements/requirements.txt \
      --replace "protobuf>=3.12,<4" "protobuf>=3.12"
      --replace "protobuf>=3.20,<4" "protobuf>=3.20"
    # ... and regenerating the paymentrequest_pb2.py file
    protoc --python_out=. electrum_grs/paymentrequest.proto