Merge pull request #207834 from prusnak/electrum-unify

unify electrum forks

pkgs/applications/misc/electrum/default.nix

@@ -141,7 +141,7 @@ python3.pkgs.buildPythonApplication {
   };
 
   meta = with lib; {
-    description = "A lightweight Bitcoin wallet";
+    description = "Lightweight Bitcoin wallet";
     longDescription = ''
       An easy-to-use Bitcoin client featuring wallets generated from
       mnemonic seeds (in addition to other, more advanced, wallet options)

pkgs/applications/misc/electrum/grs.nix

@@ -63,7 +63,13 @@ python3.pkgs.buildPythonApplication {
     qdarkstyle
   ];
 
-  preBuild = ''
+  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_grs/paymentrequest.proto
+
     substituteInPlace ./electrum_grs/ecc_fast.py \
       --replace ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}
   '' + (if enableQt then ''
@@ -85,6 +91,9 @@ python3.pkgs.buildPythonApplication {
     wrapQtApp $out/bin/electrum-grs
   '';
 
+  # the tests are currently broken
+  doCheck = false;
+
   postCheck = ''
     $out/bin/electrum-grs help >/dev/null
   '';

pkgs/applications/misc/electrum/ltc.nix

@@ -7,16 +7,6 @@
 , zbar
 , secp256k1
 , enableQt ? true
-# for updater.nix
-, writeScript
-, common-updater-scripts
-, bash
-, coreutils
-, curl
-, gnugrep
-, gnupg
-, gnused
-, nix
 }:
 
 let
@@ -29,6 +19,7 @@ let
 
   libzbar_name =
     if stdenv.isLinux then "libzbar.so.0"
+    else if stdenv.isDarwin then "libzbar.0.dylib"
     else "libzbar${stdenv.hostPlatform.extensions.sharedLibrary}";
 
   # Not provided in official source releases, which are what upstream signs.
@@ -131,21 +122,6 @@ python3.pkgs.buildPythonApplication {
     $out/bin/electrum-ltc help >/dev/null
   '';
 
-  passthru.updateScript = import ./update.nix {
-    inherit lib;
-    inherit
-      writeScript
-      common-updater-scripts
-      bash
-      coreutils
-      curl
-      gnupg
-      gnugrep
-      gnused
-      nix
-    ;
-  };
-
   meta = with lib; {
     description = "Lightweight Litecoin Client";
     longDescription = ''

pkgs/development/python-modules/groestlcoin_hash/default.nix

@@ -21,6 +21,6 @@ buildPythonPackage rec {
     description = "Bindings for groestl key derivation function library used in Groestlcoin";
     homepage = "https://pypi.org/project/groestlcoin_hash/";
     maintainers = with maintainers; [ gruve-p ];
-    license = licenses.unfree;
+    license = licenses.mit;
   };
 }

pkgs/top-level/all-packages.nix

@@ -28440,7 +28440,7 @@ with pkgs;
 
   electrum = libsForQt5.callPackage ../applications/misc/electrum { };
 
-  electrum-grs = libsForQt5.callPackage ../applications/misc/electrum-grs { };
+  electrum-grs = libsForQt5.callPackage ../applications/misc/electrum/grs.nix { };
 
   electrum-ltc = libsForQt5.callPackage ../applications/misc/electrum/ltc.nix { };